Skip to content

[llvm] Use the VFS to make path absolute #161271

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 2 commits into from
Sep 30, 2025
Merged

[llvm] Use the VFS to make path absolute #161271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94a632
[llvm] Use the VFS to make path absolute
jansvoboda11 Sep 29, 2025
d35ad7d
Fix Windows CI
jansvoboda11 Sep 30, 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
9 changes: 7 additions & 2 deletions llvm/lib/Support/VirtualFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,12 @@ class llvm::vfs::RedirectingFileSystemParser {
FullPath = FS->getOverlayFileDir();
assert(!FullPath.empty() &&
"External contents prefix directory must exist");
llvm::sys::path::append(FullPath, Value);
SmallString<256> AbsFullPath = Value;
if (FS->makeAbsolute(FullPath, AbsFullPath)) {
error(N, "failed to make 'external-contents' absolute");
return nullptr;
}
FullPath = AbsFullPath;
} else {
FullPath = Value;
}
Expand Down Expand Up @@ -2204,7 +2209,7 @@ RedirectingFileSystem::create(std::unique_ptr<MemoryBuffer> Buffer,
// FS->OverlayFileDir => /<absolute_path_to>/dummy.cache/vfs
//
SmallString<256> OverlayAbsDir = sys::path::parent_path(YAMLFilePath);
std::error_code EC = llvm::sys::fs::make_absolute(OverlayAbsDir);
std::error_code EC = FS->makeAbsolute(OverlayAbsDir);
assert(!EC && "Overlay dir final path must be absolute");
(void)EC;
FS->setOverlayFileDir(OverlayAbsDir);
Expand Down
23 changes: 23 additions & 0 deletions llvm/unittests/Support/VirtualFileSystemTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,6 +1941,29 @@ TEST_F(VFSFromYAMLTest, ReturnsExternalPathVFSHit) {
EXPECT_EQ(0, NumDiagnostics);
}

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

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

TEST_F(VFSFromYAMLTest, RootRelativeToOverlayDirTest) {
auto Lower = makeIntrusiveRefCnt<DummyFileSystem>();
Lower->addDirectory("//root/foo/bar");
Expand Down