<div dir="ltr">I think I've found the bug, but I need to spend some more time on it.<div><br></div><div>I've reverted in for now in r337749.</div><div><br></div><div>/Eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 23, 2018 at 1:25 PM Eric Fiselier <<a href="mailto:eric@efcs.ca">eric@efcs.ca</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Thanks. I'm looking into this.<div><br></div><div>/Eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 23, 2018 at 12:58 PM Jonas Hahnfeld <<a href="mailto:hahnjo@hahnjo.de" target="_blank">hahnjo@hahnjo.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Eric,<br>
<br>
this breaks <br>
test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp <br>
for me:<br>
In access_denied_on_recursion_test_case():176 Assertion TEST_CHECK(ec) <br>
failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In access_denied_on_recursion_test_case():177 Assertion TEST_CHECK(it == <br>
endIt) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In access_denied_on_recursion_test_case():189 Assertion <br>
TEST_REQUIRE_THROW(filesystem_error,++it) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In test_PR35078():285 Assertion TEST_REQUIRE(it != endIt) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In test_PR35078_with_symlink():384 Assertion TEST_CHECK(ec) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In test_PR35078_with_symlink():385 Assertion TEST_CHECK(ec == eacess_ec) <br>
failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In test_PR35078_with_symlink_file():461 Assertion TEST_CHECK(*it == <br>
symFile) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
In test_PR35078_with_symlink_file():467 Assertion TEST_REQUIRE(it != <br>
EndIt) failed.<br>
     in file: <br>
<<<LLVM>>>/projects/libcxx/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp<br>
<br>
Summary for testsuite recursive_directory_iterator_increment_tests:<br>
     5 of 9 test cases passed.<br>
     156 of 164 assertions passed.<br>
     0 unsupported test cases.<br>
<br>
Do you have an idea? I'm on a local XFS mount, the sources are on NFS...<br>
<br>
Thanks,<br>
Jonas<br>
<br>
On 2018-07-23 06:55, Eric Fiselier via cfe-commits wrote:<br>
> Author: ericwf<br>
> Date: Sun Jul 22 21:55:57 2018<br>
> New Revision: 337669<br>
> <br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=337669&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=337669&view=rev</a><br>
> Log:<br>
> Use possibly cached directory entry values when performing recursive<br>
> directory iteration.<br>
> <br>
> Modified:<br>
>     libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp<br>
> <br>
> Modified: <br>
> libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp?rev=337669&r1=337668&r2=337669&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp?rev=337669&r1=337668&r2=337669&view=diff</a><br>
> ==============================================================================<br>
> --- libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp <br>
> (original)<br>
> +++ libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp<br>
> Sun Jul 22 21:55:57 2018<br>
> @@ -359,13 +359,13 @@ bool recursive_directory_iterator::__try<br>
>    bool skip_rec = false;<br>
>    std::error_code m_ec;<br>
>    if (!rec_sym) {<br>
> -    file_status st = curr_it.__entry_.symlink_status(m_ec);<br>
> +    file_status st(curr_it.__entry_.__get_sym_ft(&m_ec));<br>
>      if (m_ec && status_known(st))<br>
>        m_ec.clear();<br>
>      if (m_ec || is_symlink(st) || !is_directory(st))<br>
>        skip_rec = true;<br>
>    } else {<br>
> -    file_status st = curr_it.__entry_.status(m_ec);<br>
> +    file_status st(curr_it.__entry_.__get_ft(&m_ec));<br>
>      if (m_ec && status_known(st))<br>
>        m_ec.clear();<br>
>      if (m_ec || !is_directory(st))<br>
> <br>
> <br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>
</blockquote></div>