Skip to content

[support] Don't require VFS in SourceMgr for loading includes #163862

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
Oct 17, 2025
Merged

[support] Don't require VFS in SourceMgr for loading includes #163862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c586a48
[support] Don't require VFS in `SourceMgr` for loading includes
jansvoboda11 Oct 16, 2025
d330aad
Naming
jansvoboda11 Oct 16, 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
10 changes: 5 additions & 5 deletions llvm/lib/Support/SourceMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,19 @@ unsigned SourceMgr::AddIncludeFile(const std::string &Filename,
ErrorOr<std::unique_ptr<MemoryBuffer>>
SourceMgr::OpenIncludeFile(const std::string &Filename,
std::string &IncludedFile) {
if (!FS)
reportFatalInternalError("Opening include file from SourceMgr without VFS");
auto GetFile = [this](StringRef Path) {
return FS ? FS->getBufferForFile(Path) : MemoryBuffer::getFile(Path);
};

ErrorOr<std::unique_ptr<MemoryBuffer>> NewBufOrErr =
FS->getBufferForFile(Filename);
ErrorOr<std::unique_ptr<MemoryBuffer>> NewBufOrErr = GetFile(Filename);

SmallString<64> Buffer(Filename);
// If the file didn't exist directly, see if it's in an include path.
for (unsigned i = 0, e = IncludeDirectories.size(); i != e && !NewBufOrErr;
++i) {
Buffer = IncludeDirectories[i];
sys::path::append(Buffer, Filename);
NewBufOrErr = FS->getBufferForFile(Buffer);
NewBufOrErr = GetFile(Buffer);
}

if (NewBufOrErr)
Expand Down