Skip to content

[llvm] Use the underlying VFS when constructing RedirectingFileSystem #160942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2025
Merged

[llvm] Use the underlying VFS when constructing RedirectingFileSystem #160942

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66d43d6
[llvm][support] Use the underlying VFS when constructing RedirectingF…
jansvoboda11 Sep 26, 2025
b6afa9a
Merge branch 'main' into overlay-vfs-use-underlying-vfs
jansvoboda11 Sep 29, 2025
622afa6
Set CWD on the underlying VFS
jansvoboda11 Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/Support/VirtualFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ class llvm::vfs::RedirectingFileSystemParser {
EC = FS->makeAbsolute(FullPath, Name);
Name = canonicalize(Name);
} else {
EC = sys::fs::make_absolute(Name);
EC = FS->makeAbsolute(Name);
}
if (EC) {
assert(NameValueNode && "Name presence should be checked earlier");
Expand Down
31 changes: 30 additions & 1 deletion llvm/unittests/Support/VirtualFileSystemTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,7 @@ TEST_F(VFSFromYAMLTest, ReturnsExternalPathVFSHit) {
EXPECT_EQ(0, NumDiagnostics);
}

TEST_F(VFSFromYAMLTest, RootRelativeTest) {
TEST_F(VFSFromYAMLTest, RootRelativeToOverlayDirTest) {
auto Lower = makeIntrusiveRefCnt<DummyFileSystem>();
Lower->addDirectory("//root/foo/bar");
Lower->addRegularFile("//root/foo/bar/a");
Expand Down Expand Up @@ -2004,6 +2004,35 @@ TEST_F(VFSFromYAMLTest, RootRelativeTest) {
#endif
}

TEST_F(VFSFromYAMLTest, RootRelativeToCWDTest) {
auto Lower = makeIntrusiveRefCnt<DummyFileSystem>();
Lower->addDirectory("//root/foo/bar");
Lower->addRegularFile("//root/foo/bar/a");
Lower->addDirectory("//root/foo/bar/cwd");
Lower->addRegularFile("//root/foo/bar/cwd/a");
Lower->setCurrentWorkingDirectory("//root/foo/bar/cwd");
IntrusiveRefCntPtr<vfs::FileSystem> FS =
getFromYAMLString("{\n"
" 'case-sensitive': false,\n"
" 'root-relative': 'cwd',\n"
" 'roots': [\n"
" { 'name': 'b', 'type': 'file',\n"
" 'external-contents': '//root/foo/bar/a'\n"
" }\n"
" ]\n"
"}",
Lower, "//root/foo/bar/overlay");

ASSERT_NE(FS.get(), nullptr);

ErrorOr<vfs::Status> S1 = FS->status("//root/foo/bar/b");
ASSERT_TRUE(S1.getError());

ErrorOr<vfs::Status> S2 = FS->status("//root/foo/bar/cwd/b");
ASSERT_FALSE(S2.getError());
EXPECT_EQ("//root/foo/bar/a", S2->getName());
}

TEST_F(VFSFromYAMLTest, ReturnsInternalPathVFSHit) {
auto BaseFS = makeIntrusiveRefCnt<vfs::InMemoryFileSystem>();
BaseFS->addFile("//root/foo/realname", 0,
Expand Down
Loading