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

Merge pull request #67263 from cachemeifyoucan/eng/PR-explicit-module-interface-check

Browse Source 
[ExplicitModule] Allow typecheck-module-from-interface using explicit module
This commit is contained in:
Steven Wu
2023-07-25 16:10:48 -07:00
committed by GitHub
parent bf1894714b 411937d653
commit b9fef33891
10 changed files with 156 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/Frontend/Frontend.cpp
View File

@@ -520,38 +520,44 @@ bool CompilerInstance::setup(const CompilerInvocation &Invoke,
}
bool CompilerInstance::setUpVirtualFileSystemOverlays() {
if (Invocation.getFrontendOptions().EnableCaching &&
(!Invocation.getFrontendOptions().CASFSRootIDs.empty() ||
!Invocation.getFrontendOptions().ClangIncludeTrees.empty())) {
// Set up CASFS as BaseFS.
if (Invocation.getFrontendOptions().EnableCaching) {
const auto &Opts = getInvocation().getFrontendOptions();
auto FS =
createCASFileSystem(*CAS, Opts.CASFSRootIDs, Opts.ClangIncludeTrees);
if (!FS) {
Diagnostics.diagnose(SourceLoc(), diag::error_cas,
toString(FS.takeError()));
return true;
if (!Invocation.getFrontendOptions().CASFSRootIDs.empty() ||
!Invocation.getFrontendOptions().ClangIncludeTrees.empty()) {
// Set up CASFS as BaseFS.
auto FS =
createCASFileSystem(*CAS, Opts.CASFSRootIDs, Opts.ClangIncludeTrees);
if (!FS) {
Diagnostics.diagnose(SourceLoc(), diag::error_cas,
toString(FS.takeError()));
return true;
}
SourceMgr.setFileSystem(std::move(*FS));
}
SourceMgr.setFileSystem(std::move(*FS));
}
// If we have a bridging header cache key, try load it now and overlay it.
if (!Invocation.getClangImporterOptions().BridgingHeaderPCHCacheKey.empty() &&
Invocation.getFrontendOptions().EnableCaching) {
auto loadedBridgingBuffer = loadCachedCompileResultFromCacheKey(
getObjectStore(), getActionCache(), Diagnostics,
Invocation.getClangImporterOptions().BridgingHeaderPCHCacheKey,
Invocation.getClangImporterOptions().BridgingHeader);
if (loadedBridgingBuffer) {
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> PCHFS =
new llvm::vfs::InMemoryFileSystem();
PCHFS->addFile(Invocation.getClangImporterOptions().BridgingHeader, 0,
std::move(loadedBridgingBuffer));
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayVFS =
new llvm::vfs::OverlayFileSystem(SourceMgr.getFileSystem());
OverlayVFS->pushOverlay(PCHFS);
SourceMgr.setFileSystem(std::move(OverlayVFS));
// If we need to load any files from CAS, try load it now and overlay it.
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> MemFS =
new llvm::vfs::InMemoryFileSystem();
const auto &ClangOpts = getInvocation().getClangImporterOptions();
if (!ClangOpts.BridgingHeaderPCHCacheKey.empty()) {
if (auto loadedBuffer = loadCachedCompileResultFromCacheKey(
getObjectStore(), getActionCache(), Diagnostics,
ClangOpts.BridgingHeaderPCHCacheKey, ClangOpts.BridgingHeader))
MemFS->addFile(Invocation.getClangImporterOptions().BridgingHeader, 0,
std::move(loadedBuffer));
}
if (!Opts.InputFileKey.empty()) {
auto InputPath = Opts.InputsAndOutputs.getFilenameOfFirstInput();
if (auto loadedBuffer = loadCachedCompileResultFromCacheKey(
getObjectStore(), getActionCache(), Diagnostics,
Opts.InputFileKey, InputPath))
MemFS->addFile(InputPath, 0, std::move(loadedBuffer));
}
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayVFS =
new llvm::vfs::OverlayFileSystem(SourceMgr.getFileSystem());
OverlayVFS->pushOverlay(MemFS);
SourceMgr.setFileSystem(std::move(OverlayVFS));
}
auto ExpectedOverlay =