Skip to content
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.

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

[6.0][Caching] Add fast swift instance setup for cache replay #73305

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/swift/Frontend/Frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,10 @@ class CompilerInstance {
bool setup(const CompilerInvocation &Invocation, std::string &Error,
ArrayRef<const char *> Args = {});

/// The fast setup function for cache replay.
bool setupForReplay(const CompilerInvocation &Invocation, std::string &Error,
ArrayRef<const char *> Args = {});

const CompilerInvocation &getInvocation() const { return Invocation; }

/// If a IDE inspection buffer has been set, returns the corresponding source
Expand Down
17 changes: 17 additions & 0 deletions lib/Frontend/Frontend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,23 @@ bool CompilerInstance::setup(const CompilerInvocation &Invoke,
return false;
}

bool CompilerInstance::setupForReplay(const CompilerInvocation &Invoke,
std::string &Error,
ArrayRef<const char *> Args) {
// This is the fast path for setup an instance for replay but cannot run
// regular compilation.
Invocation = Invoke;

if (setupCASIfNeeded(Args)) {
Error = "Setting up CAS failed";
return true;
}

setupOutputBackend();
setupCachingDiagnosticsProcessorIfNeeded();
return false;
}

bool CompilerInstance::setUpVirtualFileSystemOverlays() {
if (Invocation.getCASOptions().requireCASFS()) {
const auto &Opts = getInvocation().getCASOptions();
Expand Down
3 changes: 2 additions & 1 deletion tools/libSwiftScan/SwiftCaching.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,8 @@ static llvm::Error replayCompilation(SwiftScanReplayInstance &Instance,
Invocation.getDiagnosticOptions().EmitMacroExpansionFiles);

std::string InstanceSetupError;
if (Inst.setup(Instance.Invocation, InstanceSetupError, Instance.Args))
if (Inst.setupForReplay(Instance.Invocation, InstanceSetupError,
Instance.Args))
return createStringError(inconvertibleErrorCode(), InstanceSetupError);

auto *CDP = Inst.getCachingDiagnosticsProcessor();
Expand Down