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 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-12-14 04:53:37 -08:00
parent e016ccf8e1 4fc9d015de
commit 7ff906d730
35 changed files with 317 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1254,17 +1254,6 @@ static bool performCompile(CompilerInstance &Instance,
if (opts.InputsAndOutputs.shouldTreatAsLLVM())
return compileLLVMIR(Instance);
// If we aren't in a parse-only context and expect an implicit stdlib import,
// load in the standard library. If we either fail to find it or encounter an
// error while loading it, bail early. Continuing the compilation will at best
// trigger a bunch of other errors due to the stdlib being missing, or at
// worst crash downstream as many call sites don't currently handle a missing
// stdlib.
if (FrontendOptions::doesActionRequireSwiftStandardLibrary(Action)) {
if (Instance.loadStdlibIfNeeded())
return true;
}
assert([&]() -> bool {
if (FrontendOptions::shouldActionOnlyParse(Action)) {
// Parsing gets triggered lazily, but let's make sure we have the right
@@ -2045,7 +2034,8 @@ int swift::performFrontend(ArrayRef<const char *> Args,
const DiagnosticOptions &diagOpts = Invocation.getDiagnosticOptions();
bool verifierEnabled = diagOpts.VerifyMode != DiagnosticOptions::NoVerify;
if (Instance->setup(Invocation)) {
std::string InstanceSetupError;
if (Instance->setup(Invocation, InstanceSetupError)) {
return finishDiagProcessing(1, /*verifierEnabled*/ false);
}