[libcxx] r337749 - Revert "Use possibly cached directory entry values when performing recursive directory iteration."

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Mon Jul 23 14:52:30 PDT 2018


Author: ericwf
Date: Mon Jul 23 14:52:29 2018
New Revision: 337749

URL: http://llvm.org/viewvc/llvm-project?rev=337749&view=rev
Log:
Revert "Use possibly cached directory entry values when performing recursive directory iteration."

This reverts commit 04ce4aef00d3ee508327f6cf7bf1b1d200ab6238.

Modified:
    libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp

Modified: libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp?rev=337749&r1=337748&r2=337749&view=diff
==============================================================================
--- libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp (original)
+++ libcxx/trunk/src/experimental/filesystem/directory_iterator.cpp Mon Jul 23 14:52:29 2018
@@ -359,13 +359,13 @@ bool recursive_directory_iterator::__try
   bool skip_rec = false;
   error_code m_ec;
   if (!rec_sym) {
-    file_status st(curr_it.__entry_.__get_sym_ft(&m_ec));
+    file_status st = curr_it.__entry_.symlink_status(m_ec);
     if (m_ec && status_known(st))
       m_ec.clear();
     if (m_ec || is_symlink(st) || !is_directory(st))
       skip_rec = true;
   } else {
-    file_status st(curr_it.__entry_.__get_ft(&m_ec));
+    file_status st = curr_it.__entry_.status(m_ec);
     if (m_ec && status_known(st))
       m_ec.clear();
     if (m_ec || !is_directory(st))




More information about the cfe-commits mailing list