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] Enable delayed body parsing for a non-primary main

Browse Source 
This better matches the behavior of
`parseAndTypeCheckMainFileUpTo`.
This commit is contained in:
Hamish Knight
2020-01-08 10:18:57 -08:00
parent 6b87dce845
commit 024e346f77
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Frontend/Frontend.cpp
View File

@@ -1095,19 +1095,25 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals,
PersistentState = llvm::make_unique<PersistentParserState>();
PersistentState->PerformConditionEvaluation = EvaluateConditionals;
auto shouldDelayBodies = [&](unsigned bufferID) -> bool {
if (!CanDelayBodies)
return false;
// Don't delay bodies in whole module mode or for primary files.
return !(isWholeModuleCompilation() || isPrimaryInput(bufferID));
};
// Parse all the library files.
for (auto BufferID : InputSourceCodeBufferIDs) {
if (BufferID == MainBufferID)
continue;
auto IsPrimary = isWholeModuleCompilation() || isPrimaryInput(BufferID);
SourceFile *NextInput = createSourceFileForMainModule(
SourceFileKind::Library, SourceFile::ImplicitModuleImportKind::None,
BufferID);
parseIntoSourceFileFull(*NextInput, BufferID, PersistentState.get(),
/*DelayBodyParsing=*/!IsPrimary && CanDelayBodies);
shouldDelayBodies(BufferID));
}
// Now parse the main file.
@@ -1115,10 +1121,10 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals,
SourceFile &MainFile =
MainModule->getMainSourceFile(Invocation.getSourceFileKind());
MainFile.SyntaxParsingCache = Invocation.getMainFileSyntaxParsingCache();
assert(MainBufferID == MainFile.getBufferID());
parseIntoSourceFileFull(MainFile, MainFile.getBufferID().getValue(),
PersistentState.get(),
/*DelayBodyParsing=*/false);
parseIntoSourceFileFull(MainFile, MainBufferID, PersistentState.get(),
shouldDelayBodies(MainBufferID));
}
assert(Context->LoadedModules.size() == 1 &&