From 69cd1ea6d6a9dbad1d702577d618d73a82160f15 Mon Sep 17 00:00:00 2001
From: Juergen Ributzka <juergen@apple.com>
Date: Fri, 10 Mar 2017 21:46:51 +0000
Subject: [PATCH] Revert r297510 "[VFS] Ignore broken symlinks in the directory
iterator."
The tests are failing on one of the bots.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@297517 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/VirtualFileSystem.h | 2 +-
lib/Basic/VirtualFileSystem.cpp | 7 +-
unittests/Basic/VirtualFileSystemTest.cpp | 83 -----------------------
3 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/include/clang/Basic/VirtualFileSystem.h b/include/clang/Basic/VirtualFileSystem.h
index e52b345e286..39dab6cbf04 100644
--- a/include/clang/Basic/VirtualFileSystem.h
+++ b/include/clang/Basic/VirtualFileSystem.h
@@ -161,7 +161,7 @@ public:
directory_iterator &increment(std::error_code &EC) {
assert(Impl && "attempting to increment past end");
EC = Impl->increment();
- if (!Impl->CurrentEntry.isStatusKnown())
+ if (EC || !Impl->CurrentEntry.isStatusKnown())
Impl.reset(); // Normalize the end iterator to Impl == nullptr.
return *this;
}
diff --git a/lib/Basic/VirtualFileSystem.cpp b/lib/Basic/VirtualFileSystem.cpp
index f5db717866a..43cd9f17ceb 100644
--- a/lib/Basic/VirtualFileSystem.cpp
+++ b/lib/Basic/VirtualFileSystem.cpp
@@ -244,7 +244,8 @@ public:
if (!EC && Iter != llvm::sys::fs::directory_iterator()) {
llvm::sys::fs::file_status S;
EC = Iter->status(S);
- CurrentEntry = Status::copyWithNewName(S, Iter->path());
+ if (!EC)
+ CurrentEntry = Status::copyWithNewName(S, Iter->path());
}
}
@@ -1855,7 +1856,7 @@ vfs::recursive_directory_iterator::recursive_directory_iterator(FileSystem &FS_,
std::error_code &EC)
: FS(&FS_) {
directory_iterator I = FS->dir_begin(Path, EC);
- if (I != directory_iterator()) {
+ if (!EC && I != directory_iterator()) {
State = std::make_shared<IterState>();
State->push(I);
}
@@ -1868,6 +1869,8 @@ recursive_directory_iterator::increment(std::error_code &EC) {
vfs::directory_iterator End;
if (State->top()->isDirectory()) {
vfs::directory_iterator I = FS->dir_begin(State->top()->getName(), EC);
+ if (EC)
+ return *this;
if (I != End) {
State->push(I);
return *this;
diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp
index 738e25b2b02..580343d93ea 100644
--- a/unittests/Basic/VirtualFileSystemTest.cpp
+++ b/unittests/Basic/VirtualFileSystemTest.cpp
@@ -305,22 +305,6 @@ struct ScopedDir {
}
operator StringRef() { return Path.str(); }
};
-
-struct ScopedLink {
- SmallString<128> Path;
- ScopedLink(const Twine &To, const Twine &From) {
- Path = From.str();
- std::error_code EC = sys::fs::create_link(To, From);
- if (EC)
- Path = "";
- EXPECT_FALSE(EC);
- }
- ~ScopedLink() {
- if (Path != "")
- EXPECT_FALSE(llvm::sys::fs::remove(Path.str()));
- }
- operator StringRef() { return Path.str(); }
-};
} // end anonymous namespace
TEST(VirtualFileSystemTest, BasicRealFSIteration) {
@@ -350,35 +334,6 @@ TEST(VirtualFileSystemTest, BasicRealFSIteration) {
EXPECT_EQ(vfs::directory_iterator(), I);
}
-TEST(VirtualFileSystemTest, BrokenSymlinkRealFSIteration) {
- ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
- IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
- ScopedLink _a("no_such_file", TestDirectory + "/a");
- ScopedDir _b(TestDirectory + "/b");
- ScopedLink _c("no_such_file", TestDirectory + "/c");
-
- std::error_code EC;
- vfs::directory_iterator I = FS->dir_begin(Twine(TestDirectory), EC);
- EXPECT_TRUE(EC);
- EXPECT_NE(vfs::directory_iterator(), I);
- EC = std::error_code();
- EXPECT_TRUE(I->getName() == _a);
- I.increment(EC);
- EXPECT_FALSE(EC);
- EXPECT_NE(vfs::directory_iterator(), I);
- EXPECT_TRUE(I->getName() == _b);
- I.increment(EC);
- EXPECT_TRUE(EC);
- EXPECT_NE(vfs::directory_iterator(), I);
- EC = std::error_code();
- EXPECT_NE(vfs::directory_iterator(), I);
- EXPECT_TRUE(I->getName() == _c);
- I.increment(EC);
- EXPECT_FALSE(EC);
- EXPECT_EQ(vfs::directory_iterator(), I);
-}
-
TEST(VirtualFileSystemTest, BasicRealFSRecursiveIteration) {
ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/true);
IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
@@ -418,44 +373,6 @@ TEST(VirtualFileSystemTest, BasicRealFSRecursiveIteration) {
EXPECT_EQ(1, Counts[3]); // d
}
-TEST(VirtualFileSystemTest, BrokenSymlinkRealFSRecursiveIteration) {
- ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
- IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem();
-
- ScopedLink _a("no_such_file", TestDirectory + "/a");
- ScopedDir _b(TestDirectory + "/b");
- ScopedLink _ba("no_such_file", TestDirectory + "/b/a");
- ScopedDir _bb(TestDirectory + "/b/b");
- ScopedLink _bc("no_such_file", TestDirectory + "/b/c");
- ScopedLink _c("no_such_file", TestDirectory + "/c");
- ScopedDir _d(TestDirectory + "/d");
- ScopedDir _dd(TestDirectory + "/d/d");
- ScopedDir _ddd(TestDirectory + "/d/d/d");
- ScopedLink _e("no_such_file", TestDirectory + "/e");
-
- std::vector<std::string> Contents;
- std::error_code EC;
- for (vfs::recursive_directory_iterator I(*FS, Twine(TestDirectory), EC), E;
- I != E; I.increment(EC)) {
- // Skip broken symlinks.
- if (EC == std::errc::no_such_file_or_directory) {
- EC = std::error_code();
- continue;
- } else if (EC) {
- break;
- }
- Contents.push_back(I->getName());
- }
-
- // Check contents.
- EXPECT_EQ(5U, Contents.size());
- EXPECT_TRUE(Contents[0] == _b);
- EXPECT_TRUE(Contents[1] == _bb);
- EXPECT_TRUE(Contents[2] == _d);
- EXPECT_TRUE(Contents[3] == _dd);
- EXPECT_TRUE(Contents[4] == _ddd);
-}
-
template <typename DirIter>
static void checkContents(DirIter I, ArrayRef<StringRef> ExpectedOut) {
std::error_code EC;
--
GitLab