Merge pull request swiftlang#22264 from gottesmm/pr-1eb3e90eae662c1a6cff4fe226e620212a0497b9

[ownership] Add a specialized version of ome that skips transparent f…

Author: gottesmm

include/swift/SILOptimizer/PassManager/Passes.def

@@ -226,6 +226,9 @@ PASS(Outliner, "outliner",
      "Function Outlining Optimization")
 PASS(OwnershipModelEliminator, "ownership-model-eliminator",
      "Eliminate Ownership Annotation of SIL")
+PASS(NonTransparentFunctionOwnershipModelEliminator,
+     "non-transparent-func-ownership-model-eliminator",
+     "Eliminate Ownership Annotations from non-transparent SIL Functions")
 PASS(RCIdentityDumper, "rc-id-dumper",
      "Print Reference Count Identities")
 PASS(PerfInliner, "inline",

lib/SILOptimizer/Transforms/OwnershipModelEliminator.cpp

@@ -287,6 +287,11 @@ bool OwnershipModelEliminatorVisitor::visitDestructureTupleInst(
 namespace {
 
 struct OwnershipModelEliminator : SILModuleTransform {
+  bool SkipTransparent;
+
+  OwnershipModelEliminator(bool SkipTransparent)
+      : SkipTransparent(SkipTransparent) {}
+
   void run() override {
     if (DumpBefore.size()) {
       getModule()->dump(DumpBefore.c_str());
@@ -297,6 +302,11 @@ struct OwnershipModelEliminator : SILModuleTransform {
       if (!F.hasOwnership())
         continue;
 
+      // If we were asked to not strip ownership from transparent functions,
+      // continue.
+      if (SkipTransparent && F.isTransparent())
+        continue;
+
       // Set F to have unqualified ownership.
       F.setOwnershipEliminated();
 
@@ -334,5 +344,9 @@ struct OwnershipModelEliminator : SILModuleTransform {
 } // end anonymous namespace
 
 SILTransform *swift::createOwnershipModelEliminator() {
-  return new OwnershipModelEliminator();
+  return new OwnershipModelEliminator(false /*skip transparent*/);
+}
+
+SILTransform *swift::createNonTransparentFunctionOwnershipModelEliminator() {
+  return new OwnershipModelEliminator(true /*skip transparent*/);
 }

test/SILOptimizer/non_transparent_ome.sil

@@ -0,0 +1,19 @@
+// RUN: %target-sil-opt -enable-sil-ownership -non-transparent-func-ownership-model-eliminator %s | %FileCheck %s
+
+sil_stage raw
+
+import Builtin
+
+// CHECK-LABEL: sil [transparent] [ossa] @foo : $@convention(thin) () -> () {
+sil [transparent] [ossa] @foo : $@convention(thin) () -> () {
+bb0:
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// CHECK-LABEL: sil @bar : $@convention(thin) () -> () {
+sil [ossa] @bar : $@convention(thin) () -> () {
+bb0:
+  %9999 = tuple()
+  return %9999 : $()
+}