averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

thread a vfs through the completion handler

Browse Source
This commit is contained in:
Marc Rasi
2019-04-30 20:39:04 -07:00
parent 419e97d7db
commit a6e0210b6d
23 changed files with 247 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Frontend/Frontend.cpp
View File

@@ -195,9 +195,14 @@ bool CompilerInstance::setUpASTContextIfNeeded() {
return false;
}
bool CompilerInstance::setup(const CompilerInvocation &Invok) {
bool CompilerInstance::setup(
const CompilerInvocation &Invok,
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
Invocation = Invok;
if (BaseFS)
SourceMgr.setFileSystem(BaseFS);
// If initializing the overlay file system fails there's no sense in
// continuing because the compiler will read the wrong files.
if (setUpVirtualFileSystemOverlays())
@@ -256,19 +261,20 @@ static bool loadAndValidateVFSOverlay(
}
bool CompilerInstance::setUpVirtualFileSystemOverlays() {
auto BaseFS = llvm::vfs::getRealFileSystem();
auto BaseFS = SourceMgr.getFileSystem();
auto OverlayFS = llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>(
new llvm::vfs::OverlayFileSystem(BaseFS));
bool hadAnyFailure = false;
bool hasOverlays = false;
for (const auto &File : Invocation.getSearchPathOptions().VFSOverlayFiles) {
hasOverlays = true;
hadAnyFailure |=
loadAndValidateVFSOverlay(File, BaseFS, OverlayFS, Diagnostics);
}
// If we successfully loaded all the overlays, let the source manager and
// diagnostic engine take advantage of the overlay file system.
if (!hadAnyFailure &&
(OverlayFS->overlays_begin() != OverlayFS->overlays_end())) {
if (!hadAnyFailure && hasOverlays) {
SourceMgr.setFileSystem(OverlayFS);
}