Merge pull request #18344 from CodaFi/unseen-university

[Frontend] Track SwiftOnoneSupport as a system dependency

Author: CodaFi

include/swift/Frontend/FrontendOptions.h

@@ -141,8 +141,6 @@ class FrontendOptions {
     EmitObject,   ///< Emit object file
   };
 
-  bool isCreatingSIL() { return RequestedAction >= ActionType::EmitSILGen; }
-
   /// Indicates the action the user requested that the frontend perform.
   ActionType RequestedAction = ActionType::NoneAction;
 
@@ -310,6 +308,7 @@ class FrontendOptions {
   static bool canActionEmitInterface(ActionType);
 
 public:
+  static bool doesActionRunSILPasses(ActionType);
   static bool doesActionProduceOutput(ActionType);
   static bool doesActionProduceTextualOutput(ActionType);
   static bool needsProperModuleName(ActionType);

lib/Frontend/Frontend.cpp

@@ -401,13 +401,6 @@ static void addAdditionalInitialImportsTo(
   SF->addImports(additionalImports);
 }
 
-static bool shouldImportSwiftOnoneModuleIfNoneOrImplicitOptimization(
-    FrontendOptions::ActionType RequestedAction) {
-  return RequestedAction == FrontendOptions::ActionType::EmitObject ||
-         RequestedAction == FrontendOptions::ActionType::Immediate ||
-         RequestedAction == FrontendOptions::ActionType::EmitSIL;
-}
-
 /// Implicitly import the SwiftOnoneSupport module in non-optimized
 /// builds. This allows for use of popular specialized functions
 /// from the standard library, which makes the non-optimized builds
@@ -420,11 +413,14 @@ shouldImplicityImportSwiftOnoneSupportModule(CompilerInvocation &Invocation) {
   if (Invocation.getSILOptions().shouldOptimize())
     return false;
 
-  if (shouldImportSwiftOnoneModuleIfNoneOrImplicitOptimization(
-          Invocation.getFrontendOptions().RequestedAction)) {
-    return true;
-  }
-  return Invocation.getFrontendOptions().isCreatingSIL();
+  // If we are not going through the SIL Optimizer with the
+  // given frontend action, do not load SwiftOnoneSupport.
+  //
+  // This optimization is disabled by -track-system-dependencies to preserve
+  // the explicit dependency.
+  const auto &options = Invocation.getFrontendOptions();
+  return options.TrackSystemDeps
+      || FrontendOptions::doesActionRunSILPasses(options.RequestedAction);
 }
 
 void CompilerInstance::performParseAndResolveImportsOnly() {

lib/Frontend/FrontendOptions.cpp

@@ -454,6 +454,39 @@ bool FrontendOptions::doesActionProduceTextualOutput(ActionType action) {
   }
 }
 
+bool FrontendOptions::doesActionRunSILPasses(ActionType action) {
+  switch (action) {
+  case ActionType::NoneAction:
+  case ActionType::Parse:
+  case ActionType::ResolveImports:
+  case ActionType::Typecheck:
+  case ActionType::DumpParse:
+  case ActionType::DumpInterfaceHash:
+  case ActionType::EmitSyntax:
+  case ActionType::DumpAST:
+  case ActionType::PrintAST:
+  case ActionType::DumpScopeMaps:
+  case ActionType::DumpTypeRefinementContexts:
+  case ActionType::EmitImportedModules:
+  case ActionType::EmitPCH:
+  case ActionType::EmitSILGen:
+    return false;
+  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:
+    return true;
+  }
+}
+
+
 const PrimarySpecificPaths &
 FrontendOptions::getPrimarySpecificPathsForAtMostOnePrimary() const {
   return InputsAndOutputs.getPrimarySpecificPathsForAtMostOnePrimary();

test/Frontend/dependencies.swift

@@ -59,6 +59,8 @@
 
 // CHECK-IMPORT-TRACK-SYSTEM-LABEL: - :
 // CHECK-IMPORT-TRACK-SYSTEM: dependencies.swift
+// CHECK-IMPORT-TRACK-SYSTEM-DAG: Swift.swiftmodule
+// CHECK-IMPORT-TRACK-SYSTEM-DAG: SwiftOnoneSupport.swiftmodule
 // CHECK-IMPORT-TRACK-SYSTEM-DAG: CoreFoundation.swift
 // CHECK-IMPORT-TRACK-SYSTEM-DAG: CoreGraphics.swift
 // CHECK-IMPORT-TRACK-SYSTEM-DAG: Foundation.swift