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 #37512 from ahoppen/pr/allow-driver-errors

Browse Source 
[SourceKit] Recover if compiler arguments have errors
This commit is contained in:
Alex Hoppen
2021-05-21 09:17:01 +02:00
committed by GitHub
parent f03ef8fd1d 44f8e195ef
commit 285cea4670
11 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Driver/Driver.cpp
View File

@@ -860,7 +860,8 @@ getDriverBatchSizeLimit(llvm::opt::InputArgList &ArgList,
std::unique_ptr<Compilation>
Driver::buildCompilation(const ToolChain &TC,
std::unique_ptr<llvm::opt::InputArgList> ArgList) {
std::unique_ptr<llvm::opt::InputArgList> ArgList,
bool AllowErrors) {
llvm::PrettyStackTraceString CrashInfo("Compilation construction");
llvm::sys::TimePoint<> StartTime = std::chrono::system_clock::now();
@@ -880,7 +881,7 @@ Driver::buildCompilation(const ToolChain &TC,
// Perform toolchain specific args validation.
TC.validateArguments(Diags, *TranslatedArgList, DefaultTargetTriple);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
if (!handleImmediateArgs(*TranslatedArgList, TC)) {
@@ -891,7 +892,7 @@ Driver::buildCompilation(const ToolChain &TC,
InputFileList Inputs;
buildInputs(TC, *TranslatedArgList, Inputs);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
// Determine the OutputInfo for the driver.
@@ -900,14 +901,14 @@ Driver::buildCompilation(const ToolChain &TC,
OI.CompilerMode = computeCompilerMode(*TranslatedArgList, Inputs, BatchMode);
buildOutputInfo(TC, *TranslatedArgList, BatchMode, Inputs, OI);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
assert(OI.CompilerOutputType != file_types::ID::TY_INVALID &&
"buildOutputInfo() must set a valid output type!");
TC.validateOutputInfo(Diags, OI);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
validateEmbedBitcode(*TranslatedArgList, OI, Diags);
@@ -919,7 +920,7 @@ Driver::buildCompilation(const ToolChain &TC,
Optional<OutputFileMap> OFM = buildOutputFileMap(
*TranslatedArgList, workingDirectory);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
if (ArgList->hasArg(options::OPT_driver_print_output_file_map)) {
@@ -927,7 +928,9 @@ Driver::buildCompilation(const ToolChain &TC,
OFM->dump(llvm::errs(), true);
else
Diags.diagnose(SourceLoc(), diag::error_no_output_file_map_specified);
return nullptr;
if (!AllowErrors) {
return nullptr;
}
}
const bool ShowIncrementalBuildDecisions =
@@ -1044,7 +1047,7 @@ Driver::buildCompilation(const ToolChain &TC,
buildActions(TopLevelActions, TC, OI,
whyIgnoreIncrementallity.empty() ? &outOfDateMap : nullptr, *C);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
if (DriverPrintActions) {
@@ -1076,7 +1079,7 @@ Driver::buildCompilation(const ToolChain &TC,
if (!whyIgnoreIncrementallity.empty())
C->disableIncrementalBuild(whyIgnoreIncrementallity);
if (Diags.hadAnyError())
if (Diags.hadAnyError() && !AllowErrors)
return nullptr;
if (DriverPrintBindings)