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

Merge remote-tracking branch 'main' into 'rebranch'

Browse Source
This commit is contained in:
Evan Wilde
2023-10-16 23:00:12 -07:00
parent 521ba9d7b2 22e79c27fb
commit 312bd47f4c
93 changed files with 2109 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Frontend/Frontend.cpp
View File

@@ -457,9 +457,10 @@ void CompilerInstance::setupOutputBackend() {
// Mirror the output into CAS.
if (supportCaching()) {
auto CASOutputBackend = createSwiftCachingOutputBackend(
CASOutputBackend = createSwiftCachingOutputBackend(
*CAS, *ResultCache, *CompileJobBaseKey,
Invocation.getFrontendOptions().InputsAndOutputs);
Invocation.getFrontendOptions().InputsAndOutputs,
Invocation.getFrontendOptions().RequestedAction);
OutputBackend =
llvm::vfs::makeMirroringOutputBackend(OutputBackend, CASOutputBackend);
}
@@ -565,15 +566,18 @@ bool CompilerInstance::setUpVirtualFileSystemOverlays() {
if (!ClangOpts.BridgingHeaderPCHCacheKey.empty()) {
if (auto loadedBuffer = loadCachedCompileResultFromCacheKey(
getObjectStore(), getActionCache(), Diagnostics,
ClangOpts.BridgingHeaderPCHCacheKey, ClangOpts.BridgingHeader))
ClangOpts.BridgingHeaderPCHCacheKey, file_types::ID::TY_PCH,
ClangOpts.BridgingHeader))
MemFS->addFile(Invocation.getClangImporterOptions().BridgingHeader, 0,
std::move(loadedBuffer));
}
if (!Opts.InputFileKey.empty()) {
auto InputPath = Opts.InputsAndOutputs.getFilenameOfFirstInput();
auto Type = file_types::lookupTypeForExtension(
llvm::sys::path::extension(InputPath));
if (auto loadedBuffer = loadCachedCompileResultFromCacheKey(
getObjectStore(), getActionCache(), Diagnostics,
Opts.InputFileKey, InputPath))
Opts.InputFileKey, Type, InputPath))
MemFS->addFile(InputPath, 0, std::move(loadedBuffer));
}
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayVFS =