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

Generalize and fix compiler resource freeing before LLVM

Browse Source 
Centralize part of the routine that selects which resources to free. Then, add an additional condition for -dump-api-path.

Before, if this option were specified along with -emit-llvm or -c, the compiler would try to rebuild the torn-down ModuleDecl and crash trying to access the torn-down ASTContext.
This commit is contained in:
Robert Widmann
2020-02-27 16:06:47 -08:00
parent 7dd000bdb5
commit a6651a920d
2 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1460,6 +1460,55 @@ static bool validateTBDIfNeeded(const CompilerInvocation &Invocation,
Opts, allSymbols);
}
enum class DeallocatableResources {
None,
SILModule,
SILModuleAndASTContext,
};
static DeallocatableResources
computeDeallocatableResources(const CompilerInvocation &Invocation,
const CompilerInstance &Instance) {
// If the stats reporter is installed, we need the ASTContext and SILModule
// to live through the entire compilation process.
if (Instance.getASTContext().Stats) {
return DeallocatableResources::None;
}
// 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.
if (!Invocation.getFrontendOptions().DumpAPIPath.empty()) {
return DeallocatableResources::SILModule;
}
// If there are multiple primary inputs it is too soon to free
// the ASTContext, etc.. OTOH, if this compilation generates code for > 1
// primary input, then freeing it after processing the last primary is
// unlikely to reduce the peak heap size. So, only optimize the
// single-primary-case (or WMO).
if (Invocation.getFrontendOptions()
.InputsAndOutputs.hasMultiplePrimaryInputs()) {
return DeallocatableResources::SILModule;
}
return DeallocatableResources::SILModuleAndASTContext;
}
static void
freeDeallocatableResourcesIfPossible(const CompilerInvocation &Invocation,
CompilerInstance &Instance) {
switch (computeDeallocatableResources(Invocation, Instance)) {
case DeallocatableResources::None:
break;
case DeallocatableResources::SILModule:
Instance.freeSILModule();
break;
case DeallocatableResources::SILModuleAndASTContext:
Instance.freeSILModule();
Instance.freeASTContext();
break;
}
}
static bool generateCode(const CompilerInvocation &Invocation,
CompilerInstance &Instance, StringRef OutputFilename,
llvm::Module *IRModule,
@@ -1469,19 +1518,8 @@ static bool generateCode(const CompilerInvocation &Invocation,
version::Version EffectiveLanguageVersion =
Instance.getASTContext().LangOpts.EffectiveLanguageVersion;
if (!Stats) {
// Free up some compiler resources now that we have an IRModule.
Instance.freeSILModule();
// If there are multiple primary inputs it is too soon to free
// the ASTContext, etc.. OTOH, if this compilation generates code for > 1
// primary input, then freeing it after processing the last primary is
// unlikely to reduce the peak heap size. So, only optimize the
// single-primary-case (or WMO).
if (!Invocation.getFrontendOptions()
.InputsAndOutputs.hasMultiplePrimaryInputs())
Instance.freeASTContext();
}
// Free up some compiler resources now that we have an IRModule.
freeDeallocatableResourcesIfPossible(Invocation, Instance);
// Now that we have a single IR Module, hand it over to performLLVM.
return performLLVM(Invocation.getIRGenOptions(), Instance.getDiags(),