Add doesActionRequireSwiftStandardLibrary

Author: CodaFi

include/swift/Frontend/FrontendOptions.h

@@ -294,9 +294,13 @@ class FrontendOptions {
   /// '.../lib/swift', otherwise '.../lib/swift_static'.
   bool UseSharedResourceFolder = true;
 
-  /// \return true if action only parses without doing other compilation steps.
+  /// \return true if the given action only parses without doing other compilation steps.
   static bool shouldActionOnlyParse(ActionType);
 
+  /// \return true if the given action requires the standard library to be
+  /// loaded before it is run.
+  static bool doesActionRequireSwiftStandardLibrary(ActionType);
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

lib/Frontend/FrontendOptions.cpp

@@ -73,20 +73,63 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
 
 bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
   switch (action) {
-  case FrontendOptions::ActionType::Parse:
-  case FrontendOptions::ActionType::DumpParse:
-  case FrontendOptions::ActionType::EmitSyntax:
-  case FrontendOptions::ActionType::DumpInterfaceHash:
-  case FrontendOptions::ActionType::EmitImportedModules:
-  case FrontendOptions::ActionType::ScanDependencies:
-  case FrontendOptions::ActionType::ScanClangDependencies:
-  case FrontendOptions::ActionType::PrintVersion:
+  case ActionType::Parse:
+  case ActionType::DumpParse:
+  case ActionType::EmitSyntax:
+  case ActionType::DumpInterfaceHash:
+  case ActionType::EmitImportedModules:
+  case ActionType::ScanDependencies:
+  case ActionType::ScanClangDependencies:
+  case ActionType::PrintVersion:
     return true;
   default:
     return false;
   }
 }
 
+bool FrontendOptions::doesActionRequireSwiftStandardLibrary(ActionType action) {
+  switch (action) {
+  case ActionType::NoneAction:
+  case ActionType::Parse:
+  case ActionType::DumpParse:
+  case ActionType::EmitSyntax:
+  case ActionType::DumpInterfaceHash:
+  case ActionType::EmitImportedModules:
+  case ActionType::ScanDependencies:
+  case ActionType::ScanClangDependencies:
+  case ActionType::PrintVersion:
+  case ActionType::EmitPCH:
+  case ActionType::EmitPCM:
+  case ActionType::DumpPCM:
+  case ActionType::CompileModuleFromInterface:
+  case ActionType::TypecheckModuleFromInterface:
+    return false;
+  case ActionType::ResolveImports:
+  case ActionType::Typecheck:
+  case ActionType::DumpAST:
+  case ActionType::PrintAST:
+  case ActionType::DumpScopeMaps:
+  case ActionType::DumpTypeRefinementContexts:
+  case ActionType::EmitSILGen:
+  case ActionType::EmitSIL:
+  case ActionType::EmitModuleOnly:
+  case ActionType::MergeModules:
+  case ActionType::EmitSIBGen:
+  case ActionType::EmitSIB:
+  case ActionType::Immediate:
+  case ActionType::REPL:
+  case ActionType::EmitAssembly:
+  case ActionType::EmitIR:
+  case ActionType::EmitBC:
+  case ActionType::EmitObject:
+  case ActionType::DumpTypeInfo:
+    assert(!FrontendOptions::shouldActionOnlyParse(action) &&
+           "Parse-only actions should not load modules!");
+    return true;
+  }
+  llvm_unreachable("Unknown ActionType");
+}
+
 void FrontendOptions::forAllOutputPaths(
     const InputFile &input, llvm::function_ref<void(StringRef)> fn) const {
   if (RequestedAction != FrontendOptions::ActionType::EmitModuleOnly &&

lib/FrontendTool/FrontendTool.cpp

@@ -1888,7 +1888,7 @@ static bool performCompile(CompilerInstance &Instance,
   // trigger a bunch of other errors due to the stdlib being missing, or at
   // worst crash downstream as many call sites don't currently handle a missing
   // stdlib.
-  if (!FrontendOptions::shouldActionOnlyParse(Action)) {
+  if (FrontendOptions::doesActionRequireSwiftStandardLibrary(Action)) {
     if (Instance.loadStdlibIfNeeded())
       return true;
   }