[llvm] c0330bc - [YAMLVFSWriter] Fix directory handling
Jan Korous via llvm-commits
llvm-commits at lists.llvm.org
Thu May 7 10:58:56 PDT 2020
Author: Jan Korous
Date: 2020-05-07T10:58:43-07:00
New Revision: c0330bc00f528a1f031f507283e3371379714ede
URL: https://github.com/llvm/llvm-project/commit/c0330bc00f528a1f031f507283e3371379714ede
DIFF: https://github.com/llvm/llvm-project/commit/c0330bc00f528a1f031f507283e3371379714ede.diff
LOG: [YAMLVFSWriter] Fix directory handling
For empty directories (except the first one) we've been adding a file
with the same name as the directory to the result VFS mapping.
Differential Revision: https://reviews.llvm.org/D79551
Added:
Modified:
llvm/lib/Support/VirtualFileSystem.cpp
llvm/unittests/Support/VirtualFileSystemTest.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Support/VirtualFileSystem.cpp b/llvm/lib/Support/VirtualFileSystem.cpp
index 22b4a08db9f7..e71b92b0718e 100644
--- a/llvm/lib/Support/VirtualFileSystem.cpp
+++ b/llvm/lib/Support/VirtualFileSystem.cpp
@@ -2066,7 +2066,8 @@ void JSONWriter::write(ArrayRef<YAMLVFSEntry> Entries,
"Overlay dir must be contained in RPath");
RPath = RPath.slice(OverlayDirLen, RPath.size());
}
- writeEntry(path::filename(Entry.VPath), RPath);
+ if (!Entry.IsDirectory)
+ writeEntry(path::filename(Entry.VPath), RPath);
}
while (!DirStack.empty()) {
diff --git a/llvm/unittests/Support/VirtualFileSystemTest.cpp b/llvm/unittests/Support/VirtualFileSystemTest.cpp
index 06db731de286..8c08cb159304 100644
--- a/llvm/unittests/Support/VirtualFileSystemTest.cpp
+++ b/llvm/unittests/Support/VirtualFileSystemTest.cpp
@@ -2238,3 +2238,39 @@ TEST_F(VFSFromYAMLTest, YAMLVFSWriterTest) {
EXPECT_TRUE(FS->exists(_g.Path));
EXPECT_TRUE(FS->exists(_h.Path));
}
+
+TEST_F(VFSFromYAMLTest, YAMLVFSWriterTestHandleDirs) {
+ ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true);
+ ScopedDir _a(TestDirectory + "/a");
+ ScopedDir _b(TestDirectory + "/b");
+ ScopedDir _c(TestDirectory + "/c");
+
+ vfs::YAMLVFSWriter VFSWriter;
+ VFSWriter.addDirectoryMapping(_a.Path, "//root/a");
+ VFSWriter.addDirectoryMapping(_b.Path, "//root/b");
+ VFSWriter.addDirectoryMapping(_c.Path, "//root/c");
+
+ std::string Buffer;
+ raw_string_ostream OS(Buffer);
+ VFSWriter.write(OS);
+ OS.flush();
+
+ // We didn't add a single file - only directories.
+ EXPECT_TRUE(Buffer.find("'type': 'file'") == std::string::npos);
+
+ IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
+ Lower->addDirectory("//root/a");
+ Lower->addDirectory("//root/b");
+ Lower->addDirectory("//root/c");
+ // canaries
+ Lower->addRegularFile("//root/a/a");
+ Lower->addRegularFile("//root/b/b");
+ Lower->addRegularFile("//root/c/c");
+
+ IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
+ ASSERT_TRUE(FS.get() != nullptr);
+
+ EXPECT_FALSE(FS->exists(_a.Path + "/a"));
+ EXPECT_FALSE(FS->exists(_b.Path + "/b"));
+ EXPECT_FALSE(FS->exists(_c.Path + "/c"));
+}
More information about the llvm-commits
mailing list