[embedded] Avoid DropAllSILPass, reuse StopOptimizationAfterSerialization instead

Author: kubamracek

include/swift/AST/SILOptions.h

@@ -170,10 +170,6 @@ class SILOptions {
   /// Whether to stop the optimization pipeline after serializing SIL.
   bool StopOptimizationAfterSerialization = false;
 
-  /// Whether to drop all SIL after serializing SIL and continue compilation
-  /// with an empty SIL module.
-  bool DropAllSILAfterSerialization = false;
-
   /// Whether to stop the optimization pipeline right before we lower ownership
   /// and go from OSSA to non-ownership SIL.
   bool StopOptimizationBeforeLoweringOwnership = false;

include/swift/SILOptimizer/PassManager/Passes.def

@@ -452,8 +452,6 @@ PASS(SimplifyUnreachableContainingBlocks, "simplify-unreachable-containing-block
      "Utility pass. Removes all non-term insts from blocks with unreachable terms")
 PASS(SerializeSILPass, "serialize-sil",
      "Utility pass. Serializes the current SILModule")
-PASS(DropAllSILPass, "drop-all-sil",
-     "Utility pass. Drops all SIL from the SILModule")
 PASS(UnitTestRunner, "test-runner",
      "Utility pass.  Parses arguments and runs code with them.")
 PASS(YieldOnceCheck, "yield-once-check",

lib/Frontend/CompilerInvocation.cpp

@@ -2186,7 +2186,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
     Opts.StopOptimizationAfterSerialization = true;
 
   if (Args.getLastArg(OPT_emit_empty_object_file)) {
-    Opts.DropAllSILAfterSerialization = true;
+    Opts.StopOptimizationAfterSerialization = true;
   }
 
   // Propagate the typechecker's understanding of

lib/IRGen/GenDecl.cpp

@@ -454,7 +454,7 @@ class PrettySynthesizedFileUnitEmission : public llvm::PrettyStackTraceEntry {
 
 /// Emit all the top-level code in the source file.
 void IRGenModule::emitSourceFile(SourceFile &SF) {
-  if (getSILModule().getOptions().DropAllSILAfterSerialization) {
+  if (getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // We're asked to emit an empty IR module
     return;
   }
@@ -1264,7 +1264,7 @@ static bool isLazilyEmittedFunction(SILFunction &f, SILModule &m) {
 
 void IRGenerator::emitGlobalTopLevel(
     const std::vector<std::string> &linkerDirectives) {
-  if (PrimaryIGM->getSILModule().getOptions().DropAllSILAfterSerialization) {
+  if (PrimaryIGM->getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // We're asked to emit an empty IR module
     return;
   }
@@ -2205,7 +2205,7 @@ void IRGenerator::emitObjCActorsNeedingSuperclassSwizzle() {
 /// from other modules. This happens e.g. if a public class contains a (dead)
 /// private method.
 void IRGenModule::emitVTableStubs() {
-  if (getSILModule().getOptions().DropAllSILAfterSerialization) {
+  if (getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // We're asked to emit an empty IR module
     return;
   }

lib/IRGen/GenReflection.cpp

@@ -1667,7 +1667,7 @@ llvm::ArrayRef<CanType> IRGenModule::getOrCreateSpecialStlibBuiltinTypes() {
 }
 
 void IRGenModule::emitBuiltinReflectionMetadata() {
-  if (getSILModule().getOptions().DropAllSILAfterSerialization) {
+  if (getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // We're asked to emit an empty IR module
     return;
   }

lib/IRGen/IRGenModule.cpp

@@ -1912,7 +1912,8 @@ void IRGenModule::cleanupClangCodeGenMetadata() {
 bool IRGenModule::finalize() {
   const char *ModuleHashVarName = "llvm.swift_module_hash";
   if (IRGen.Opts.OutputKind == IRGenOutputKind::ObjectFile &&
-      !Module.getGlobalVariable(ModuleHashVarName) && !getSILModule().getOptions().DropAllSILAfterSerialization) {
+      !Module.getGlobalVariable(ModuleHashVarName) &&
+      !getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // Create a global variable into which we will store the hash of the
     // module (used for incremental compilation).
     // We have to create the variable now (before we emit the global lists).
@@ -1969,7 +1970,7 @@ bool IRGenModule::finalize() {
     if (F.hasDLLImportStorageClass())
       F.setDSOLocal(false);
 
-  if (getSILModule().getOptions().DropAllSILAfterSerialization) {
+  if (getSILModule().getOptions().StopOptimizationAfterSerialization) {
     // We're asked to emit an empty IR module, check that that's actually true
     if (Module.global_size() != 0 || Module.size() != 0) {
       Module.dump();

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -997,9 +997,6 @@ SILPassPipelinePlan::getPerformancePassPipeline(const SILOptions &Options) {
   if (Options.StopOptimizationAfterSerialization)
     return P;
 
-  if (Options.DropAllSILAfterSerialization)
-    P.addDropAllSILPass();
-
   // After serialization run the function pass pipeline to iteratively lower
   // high-level constructs like @_semantics calls.
   addMidLevelFunctionPipeline(P);
@@ -1058,9 +1055,6 @@ SILPassPipelinePlan::getOnonePassPipeline(const SILOptions &Options) {
   P.startPipeline("Serialization");
   P.addSerializeSILPass();
 
-  if (Options.DropAllSILAfterSerialization)
-    P.addDropAllSILPass();
-
   // Now that we have serialized, propagate debug info.
   P.addMovedAsyncVarDebugInfoPropagator();
 

lib/SILOptimizer/UtilityPasses/CMakeLists.txt

@@ -13,7 +13,6 @@ target_sources(swiftSILOptimizer PRIVATE
   ComputeLoopInfo.cpp
   ConstantEvaluatorTester.cpp
   ConstantEvaluableSubsetChecker.cpp
-  DropAllSILPass.cpp
   EpilogueARCMatcherDumper.cpp
   EpilogueRetainReleaseMatcherDumper.cpp
   FunctionOrderPrinter.cpp