Merge pull request #19346 from compnerd/frontend-order

CodaFi · web-flow · commit 46248585046c · 2018-09-19T13:32:15.000-04:00
Frontend: force order of evaluation
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -517,7 +517,9 @@ void CompilerInstance::performSemaUpTo(SourceFile::ASTStage_t LimitStage) {
   }
 
   FrontendStatsTracer tracer(Context->Stats, "perform-sema");
-  Context->LoadedModules[MainModule->getName()] = getMainModule();
+
+  ModuleDecl *mainModule = getMainModule();
+  Context->LoadedModules[mainModule->getName()] = mainModule;
 
   if (Invocation.getInputKind() == InputFileKind::SIL) {
     assert(!InputSourceCodeBufferIDs.empty());

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,9 @@ void CompilerInstance::performSemaUpTo(SourceFile::ASTStage_t LimitStage) {`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`FrontendStatsTracer tracer(Context->Stats, "perform-sema");`
`520`		`- Context->LoadedModules[MainModule->getName()] = getMainModule();`
	`520`	`+`
	`521`	`+ ModuleDecl *mainModule = getMainModule();`
	`522`	`+ Context->LoadedModules[mainModule->getName()] = mainModule;`
`521`	`523`
`522`	`524`	`if (Invocation.getInputKind() == InputFileKind::SIL) {`
`523`	`525`	`assert(!InputSourceCodeBufferIDs.empty());`