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 pull request #31609 from hamishknight/ill-sil-you-in-later

Browse Source
This commit is contained in:
Hamish Knight
2020-05-07 18:02:52 -07:00
committed by GitHub
parent 00ff1c3552 70abfd3252
commit 98d3a81ede
15 changed files with 198 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1066,17 +1066,11 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
static bool performCompileStepsPostSema(CompilerInstance &Instance,
int &ReturnValue,
FrontendObserver *observer) {
auto mod = Instance.getMainModule();
if (auto SM = Instance.takeSILModule()) {
const PrimarySpecificPaths PSPs =
Instance.getPrimarySpecificPathsForAtMostOnePrimary();
return performCompileStepsPostSILGen(Instance, std::move(SM), mod, PSPs,
ReturnValue, observer);
}
const auto &Invocation = Instance.getInvocation();
const SILOptions &SILOpts = Invocation.getSILOptions();
const FrontendOptions &opts = Invocation.getFrontendOptions();
auto *mod = Instance.getMainModule();
if (!opts.InputsAndOutputs.hasPrimaryInputs()) {
// If there are no primary inputs the compiler is in WMO mode and builds one
// SILModule for the entire module.
@@ -1466,30 +1460,24 @@ static bool validateTBDIfNeeded(const CompilerInvocation &Invocation,
}
}
enum class DeallocatableResources {
None,
SILModule,
SILModuleAndASTContext,
};
static DeallocatableResources
computeDeallocatableResources(const CompilerInstance &Instance) {
// If the stats reporter is installed, we need the ASTContext and SILModule
// to live through the entire compilation process.
static void freeASTContextIfPossible(CompilerInstance &Instance) {
// If the stats reporter is installed, we need the ASTContext to live through
// the entire compilation process.
if (Instance.getASTContext().Stats) {
return DeallocatableResources::None;
return;
}
// If we're going to dump the API of the module, we cannot tear down
// the ASTContext, as that would cause the module to be freed prematurely.
const auto &opts = Instance.getInvocation().getFrontendOptions();
if (!opts.DumpAPIPath.empty()) {
return DeallocatableResources::SILModule;
return;
}
// Verifying incremental dependencies relies on access to the Swift Module's
// source files. We can still free the SIL module, though.
// source files.
if (opts.EnableIncrementalDependencyVerifier) {
return DeallocatableResources::SILModule;
return;
}
// If there are multiple primary inputs it is too soon to free
@@ -1498,29 +1486,14 @@ computeDeallocatableResources(const CompilerInstance &Instance) {
// unlikely to reduce the peak heap size. So, only optimize the
// single-primary-case (or WMO).
if (opts.InputsAndOutputs.hasMultiplePrimaryInputs()) {
return DeallocatableResources::SILModule;
return;
}
return DeallocatableResources::SILModuleAndASTContext;
}
// Make sure we emit dependencies now, because we can't do it after the
// context is gone.
emitReferenceDependenciesForAllPrimaryInputsIfNeeded(Instance);
static void freeDeallocatableResourcesIfPossible(CompilerInstance &Instance) {
switch (computeDeallocatableResources(Instance)) {
case DeallocatableResources::None:
break;
case DeallocatableResources::SILModule:
Instance.freeSILModule();
break;
case DeallocatableResources::SILModuleAndASTContext:
Instance.freeSILModule();
// Make sure we emit dependencies now, because we can't do it after the
// context is gone.
emitReferenceDependenciesForAllPrimaryInputsIfNeeded(Instance);
Instance.freeASTContext();
break;
}
Instance.freeASTContext();
}
static bool generateCode(CompilerInstance &Instance, StringRef OutputFilename,
@@ -1533,7 +1506,7 @@ static bool generateCode(CompilerInstance &Instance, StringRef OutputFilename,
Instance.getASTContext().LangOpts.EffectiveLanguageVersion;
// Free up some compiler resources now that we have an IRModule.
freeDeallocatableResourcesIfPossible(Instance);
freeASTContextIfPossible(Instance);
// Now that we have a single IR Module, hand it over to performLLVM.
return performLLVM(opts, Instance.getDiags(), nullptr, HashGlobal, IRModule,