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

[Frontend] Move parse-only module load assert

Browse Source 
Move into `performEndOfPipelineActions`, and move
the call up a bit in `performCompile` to make sure
it gets called even for a parse-only invocation.

Unfortunately this requires carving out an
exception for `-emit-imported-modules`, which can
load modules.
This commit is contained in:
Hamish Knight
2020-06-08 12:44:15 -07:00
parent ff170df10c
commit 7824dc1048
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1226,9 +1226,20 @@ static bool emitAnyWholeModulePostTypeCheckSupplementaryOutputs(
/// before or after LLVM depending on when the ASTContext gets freed.
static void performEndOfPipelineActions(CompilerInstance &Instance) {
assert(Instance.hasASTContext());
auto &ctx = Instance.getASTContext();
// Make sure we didn't load a module during a parse-only invocation, unless
// it's -emit-imported-modules, which can load modules.
auto action = Instance.getInvocation().getFrontendOptions().RequestedAction;
if (FrontendOptions::shouldActionOnlyParse(action) &&
action != FrontendOptions::ActionType::EmitImportedModules) {
assert(ctx.LoadedModules.size() == 1 &&
"Loaded a module during parse-only");
assert(ctx.LoadedModules.front().second == Instance.getMainModule());
}
// Verify the AST for all the modules we've loaded.
Instance.getASTContext().verifyAllLoadedModules();
ctx.verifyAllLoadedModules();
// Emit dependencies and index data.
emitReferenceDependenciesForAllPrimaryInputsIfNeeded(Instance);
@@ -1273,6 +1284,13 @@ static bool performCompile(CompilerInstance &Instance,
return true;
}
SWIFT_DEFER {
// We might have freed the ASTContext already, but in that case we would
// have already performed these actions.
if (Instance.hasASTContext())
performEndOfPipelineActions(Instance);
};
if (FrontendOptions::shouldActionOnlyParse(Action)) {
Instance.performParseOnly();
} else if (Action == FrontendOptions::ActionType::ResolveImports) {
@@ -1330,13 +1348,6 @@ static bool performCompile(CompilerInstance &Instance,
emitSwiftRangesForAllPrimaryInputsIfNeeded(Instance);
emitCompiledSourceForAllPrimaryInputsIfNeeded(Instance);
SWIFT_DEFER {
// We might have freed the ASTContext already, but in that case we would
// have already performed these actions.
if (Instance.hasASTContext())
performEndOfPipelineActions(Instance);
};
if (Context.hadError())
return true;