Optimizer: remove the now unused NonTransparentFunctionOwnershipModelEliminator pass

Also remove the `skipStdlibModule` flag from the OwnershipModelEliminator, because it's always false

Author: eeckstein

include/swift/SIL/SILModule.h

@@ -393,10 +393,6 @@ class SILModule {
 
   bool parsedAsSerializedSIL;
 
-  /// Set if we have registered a deserialization notification handler for
-  /// lowering ownership in non transparent functions.
-  /// This gets set in NonTransparent OwnershipModelEliminator pass.
-  bool regDeserializationNotificationHandlerForNonTransparentFuncOME;
   /// Set if we have registered a deserialization notification handler for
   /// lowering ownership in transparent functions.
   /// This gets set in OwnershipModelEliminator pass.
@@ -449,15 +445,9 @@ class SILModule {
     deserializationNotificationHandlers.erase(handler);
   }
 
-  bool hasRegisteredDeserializationNotificationHandlerForNonTransparentFuncOME() {
-    return regDeserializationNotificationHandlerForNonTransparentFuncOME;
-  }
   bool hasRegisteredDeserializationNotificationHandlerForAllFuncOME() {
     return regDeserializationNotificationHandlerForAllFuncOME;
   }
-  void setRegisteredDeserializationNotificationHandlerForNonTransparentFuncOME() {
-    regDeserializationNotificationHandlerForNonTransparentFuncOME = true;
-  }
   void setRegisteredDeserializationNotificationHandlerForAllFuncOME() {
     regDeserializationNotificationHandlerForAllFuncOME = true;
   }

include/swift/SILOptimizer/PassManager/Passes.def

@@ -377,9 +377,6 @@ LEGACY_PASS(ModulePrinter, "module-printer",
      "Print the module")
 LEGACY_PASS(NestedSemanticFunctionCheck, "nested-semantic-function-check",
      "Diagnose improperly nested '@_semantics' functions")
-LEGACY_PASS(NonTransparentFunctionOwnershipModelEliminator,
-     "non-transparent-func-ownership-model-eliminator",
-     "Eliminate Ownership Annotations from non-transparent SIL Functions")
 LEGACY_PASS(RCIdentityDumper, "rc-id-dumper",
      "Print Reference Count Identities")
 LEGACY_PASS(AlwaysInlineInliner, "always-inline",

lib/SIL/IR/SILModule.cpp

@@ -112,7 +112,6 @@ SILModule::SILModule(llvm::PointerUnion<FileUnit *, ModuleDecl *> context,
     : Stage(SILStage::Raw), loweredAddresses(!Options.EnableSILOpaqueValues),
       indexTrieRoot(new IndexTrieNode()), Options(Options),
       irgenOptions(irgenOptions), serialized(false),
-      regDeserializationNotificationHandlerForNonTransparentFuncOME(false),
       regDeserializationNotificationHandlerForAllFuncOME(false),
       hasAccessMarkerHandler(false),
       prespecializedFunctionDeclsImported(false), SerializeSILAction(),

lib/SILOptimizer/Mandatory/OwnershipModelEliminator.cpp

@@ -871,17 +871,6 @@ static bool stripOwnership(SILFunction &func) {
   return madeChange;
 }
 
-static void prepareNonTransparentSILFunctionForOptimization(ModuleDecl *,
-                                                            SILFunction *f) {
-  if (!f->hasOwnership() || f->isTransparent())
-    return;
-
-  LLVM_DEBUG(llvm::dbgs() << "After deserialization, stripping ownership in:"
-                          << f->getName() << "\n");
-
-  stripOwnership(*f);
-}
-
 static void prepareSILFunctionForOptimization(ModuleDecl *, SILFunction *f) {
   if (!f->hasOwnership())
     return;
@@ -895,11 +884,7 @@ static void prepareSILFunctionForOptimization(ModuleDecl *, SILFunction *f) {
 namespace {
 
 struct OwnershipModelEliminator : SILFunctionTransform {
-  bool skipTransparent;
-  bool skipStdlibModule;
-
-  OwnershipModelEliminator(bool skipTransparent, bool skipStdlibModule)
-      : skipTransparent(skipTransparent), skipStdlibModule(skipStdlibModule) {}
+  OwnershipModelEliminator() {}
 
   void run() override {
     if (DumpBefore.size()) {
@@ -909,20 +894,9 @@ struct OwnershipModelEliminator : SILFunctionTransform {
     auto *f = getFunction();
     auto &mod = getFunction()->getModule();
 
-    // If we are supposed to skip the stdlib module and we are in the stdlib
-    // module bail.
-    if (skipStdlibModule && mod.isStdlibModule()) {
-      return;
-    }
-
     if (!f->hasOwnership())
       return;
 
-    // If we were asked to not strip ownership from transparent functions in
-    // /our/ module, return.
-    if (skipTransparent && f->isTransparent())
-      return;
-
     // Verify here to make sure ownership is correct before we strip.
     {
       // Add a pretty stack trace entry to tell users who see a verification
@@ -950,37 +924,20 @@ struct OwnershipModelEliminator : SILFunctionTransform {
       invalidateAnalysis(InvalidKind);
     }
 
-    // If we were asked to strip transparent, we are at the beginning of the
-    // performance pipeline. In such a case, we register a handler so that all
-    // future things we deserialize have ownership stripped.
+    // Register a handler so that all future things we deserialize have ownership stripped.
     using NotificationHandlerTy =
         FunctionBodyDeserializationNotificationHandler;
     std::unique_ptr<DeserializationNotificationHandler> ptr;
-    if (skipTransparent) {
-      if (!mod.hasRegisteredDeserializationNotificationHandlerForNonTransparentFuncOME()) {
-        ptr.reset(new NotificationHandlerTy(
-            prepareNonTransparentSILFunctionForOptimization));
-        mod.registerDeserializationNotificationHandler(std::move(ptr));
-        mod.setRegisteredDeserializationNotificationHandlerForNonTransparentFuncOME();
-      }
-    } else {
-      if (!mod.hasRegisteredDeserializationNotificationHandlerForAllFuncOME()) {
-        ptr.reset(new NotificationHandlerTy(prepareSILFunctionForOptimization));
-        mod.registerDeserializationNotificationHandler(std::move(ptr));
-        mod.setRegisteredDeserializationNotificationHandlerForAllFuncOME();
-      }
+    if (!mod.hasRegisteredDeserializationNotificationHandlerForAllFuncOME()) {
+      ptr.reset(new NotificationHandlerTy(prepareSILFunctionForOptimization));
+      mod.registerDeserializationNotificationHandler(std::move(ptr));
+      mod.setRegisteredDeserializationNotificationHandlerForAllFuncOME();
     }
   }
 };
 
 } // end anonymous namespace
 
 SILTransform *swift::createOwnershipModelEliminator() {
-  return new OwnershipModelEliminator(false /*skip transparent*/,
-                                      false /*ignore stdlib*/);
-}
-
-SILTransform *swift::createNonTransparentFunctionOwnershipModelEliminator() {
-  return new OwnershipModelEliminator(true /*skip transparent*/,
-                                      false /*ignore stdlib*/);
+  return new OwnershipModelEliminator();
 }

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -577,8 +577,6 @@ void SILPassManager::dumpPassInfo(const char *Title, unsigned TransIdx,
 
 bool SILPassManager::isMandatoryFunctionPass(SILFunctionTransform *sft) {
   return isMandatory ||
-         sft->getPassKind() ==
-             PassKind::NonTransparentFunctionOwnershipModelEliminator ||
          sft->getPassKind() == PassKind::OwnershipModelEliminator;
 }
 

test/SILOptimizer/ome_non_transparent.sil

@@ -1,7 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -parse-sil -module-name OMEStripDeserializationInput %S/Inputs/ome_strip_deserialize_input.sil -emit-module -o %t/OMEStripDeserializationInput.swiftmodule
-// RUN: %target-sil-opt -non-transparent-func-ownership-model-eliminator -performance-linker -I %t %s | %FileCheck %s
-// RUN: %target-sil-opt -ownership-model-eliminator -performance-linker -I %t %s | %FileCheck --check-prefix=CHECK-STRIP-ALL %s
+// RUN: %target-sil-opt -ownership-model-eliminator -performance-linker -I %t %s | %FileCheck %s
 
 sil_stage canonical
 
@@ -11,22 +10,14 @@ import OMEStripDeserializationInput
 // ownership SIL.
 
 // CHECK-LABEL: sil public_external [serialized] @bar : $@convention(thin) () -> ()
-// CHECK: } // end sil function 'bar'
-
-// CHECK-STRIP-ALL-LABEL: sil public_external [serialized] @bar : $@convention(thin) () -> ()
-// CHECK-STRIP-ALL: } // end sil function 'bar'
+// CHECK:       } // end sil function 'bar'
 sil [ossa] @bar : $@convention(thin) () -> ()
 
-// CHECK-LABEL: sil public_external [transparent] [serialized] [ossa] @transparent_bar : $@convention(thin) () -> ()
-// CHECK: } // end sil function 'transparent_bar'
-
-// CHECK-STRIP-ALL-LABEL: sil public_external [transparent] [serialized] @transparent_bar : $@convention(thin) () -> ()
-// CHECK-STRIP-ALL: } // end sil function 'transparent_bar'
+// CHECK-LABEL: sil public_external [transparent] [serialized] @transparent_bar : $@convention(thin) () -> ()
+// CHECK:       } // end sil function 'transparent_bar'
 
 sil [transparent] [ossa] @transparent_bar : $@convention(thin) () -> ()
 
-// CHECK-LABEL: sil @foo : $@convention(thin) () -> () {
-// CHECK: } // end sil function 'foo'
 sil [ossa] @foo : $@convention(thin) () -> () {
 bb0:
   %0 = function_ref @bar : $@convention(thin) () -> ()