Merge pull request swiftlang#77232 from slavapestov/no-ast-context

slavapestov · web-flow · commit 1af1af7d4509 · 2024-10-26T01:59:48.000-04:00
Frontend: Fix crash when -stats-output-dir used with -typecheck-module-from-interface
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -563,7 +563,9 @@ bool CompilerInstance::setup(const CompilerInvocation &Invoke,
     return true;
   }
 
-  setupStatsReporter();
+  if (hasASTContext()) {
+    setupStatsReporter();
+  }
 
   if (setupDiagnosticVerifierIfNeeded()) {
     Error = "Setting up diagnostics verifier failed";
diff --git a/test/Misc/stats_dir_verify_module_interface.swift b/test/Misc/stats_dir_verify_module_interface.swift
@@ -0,0 +1,3 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t/foo.swiftinterface) %s -module-name foo
+// RUN: %target-swift-frontend -typecheck-module-from-interface %t/foo.swiftinterface -stats-output-dir %t

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,9 @@ bool CompilerInstance::setup(const CompilerInvocation &Invoke,`
`563`	`563`	`return true;`
`564`	`564`	`}`
`565`	`565`
`566`		`- setupStatsReporter();`
	`566`	`+ if (hasASTContext()) {`
	`567`	`+ setupStatsReporter();`
	`568`	`+ }`
`567`	`569`
`568`	`570`	`if (setupDiagnosticVerifierIfNeeded()) {`
`569`	`571`	`Error = "Setting up diagnostics verifier failed";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// RUN: %empty-directory(%t)`
	`2`	`+// RUN: %target-swift-emit-module-interface(%t/foo.swiftinterface) %s -module-name foo`
	`3`	`+// RUN: %target-swift-frontend -typecheck-module-from-interface %t/foo.swiftinterface -stats-output-dir %t`