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 remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Nathan Hawes
2020-08-21 22:23:58 -07:00
parent bd02dc4a4b 0bd8b140db
commit 280d4c995a
29 changed files with 470 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1752,7 +1752,8 @@ static void performEndOfPipelineActions(CompilerInstance &Instance) {
/// \param Instance Will be reset after performIRGeneration when the verifier
/// mode is NoVerify and there were no errors.
/// \returns true on error
static bool performCompile(CompilerInstance &Instance,
static bool performCompile(CompilerInvocation &Invok,
CompilerInstance &Instance,
ArrayRef<const char *> Args,
int &ReturnValue,
FrontendObserver *observer) {
@@ -1840,7 +1841,8 @@ static bool performCompile(CompilerInstance &Instance,
if (batchScanInput.empty())
return finishPipeline(scanDependencies(Instance));
else
return finishPipeline(batchScanModuleDependencies(Instance,
return finishPipeline(batchScanModuleDependencies(Invok,
Instance,
batchScanInput));
}
@@ -2653,7 +2655,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
}
int ReturnValue = 0;
bool HadError = performCompile(*Instance, Args, ReturnValue, observer);
bool HadError = performCompile(Invocation, *Instance, Args, ReturnValue, observer);
if (verifierEnabled) {
DiagnosticEngine &diags = Instance->getDiags();