Merge pull request #10885 from aschwaighofer/jumpthread_for_arc

SimplifyCFG: JumpThread to facilitate ARC removal

Author: aschwaighofer

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -932,6 +932,31 @@ void SimplifyCFG::findLoopHeaders() {
   }
 }
 
+static bool couldRemoveRelease(SILBasicBlock *SrcBB, SILValue SrcV,
+                               SILBasicBlock *DestBB, SILValue DestV) {
+  bool IsRetainOfSrc = false;
+  for (auto *U: SrcV->getUses())
+    if (U->getUser()->getParent() == SrcBB &&
+        (isa<StrongRetainInst>(U->getUser()) ||
+         isa<RetainValueInst>(U->getUser()))) {
+      IsRetainOfSrc = true;
+      break;
+    }
+  if (!IsRetainOfSrc)
+    return false;
+
+  bool IsReleaseOfDest = false;
+  for (auto *U: DestV->getUses())
+    if (U->getUser()->getParent() == DestBB &&
+        (isa<StrongReleaseInst>(U->getUser()) ||
+         isa<ReleaseValueInst>(U->getUser()))) {
+      IsReleaseOfDest = true;
+      break;
+    }
+
+  return IsReleaseOfDest;
+}
+
 /// tryJumpThreading - Check to see if it looks profitable to duplicate the
 /// destination of an unconditional jump into the bottom of this block.
 bool SimplifyCFG::tryJumpThreading(BranchInst *BI) {
@@ -961,6 +986,14 @@ bool SimplifyCFG::tryJumpThreading(BranchInst *BI) {
   int ThreadingBudget = 0;
 
   for (unsigned i = 0, e = BI->getArgs().size(); i != e; ++i) {
+    // If the value being substituted on is release there is a chance we could
+    // remove the release after jump threading.
+    if (couldRemoveRelease(SrcBB, BI->getArg(i), DestBB,
+                           DestBB->getArgument(i))) {
+        ThreadingBudget = 8;
+        break;
+    }
+
     // If the value being substituted is an enum, check to see if there are any
     // switches on it.
     SILValue Arg = BI->getArg(i);

test/SILOptimizer/simplify_cfg.sil

@@ -2859,3 +2859,45 @@ bb5(%e : $MyError):
 bb6(%44 : $Builtin.Int8):
   return %44 : $Builtin.Int8
 }
+
+// CHECK-LABEL: jump_thread_retain_release
+// CHECK: cond_br
+// CHECK:   cond_br %3, bb3, bb4
+
+// CHECK: bb3:
+// CHECK:   strong_retain %1 : $foo
+// CHECK:   strong_release %1 : $foo
+// CHECK:   br bb5(%1 : $foo)
+
+// CHECK: bb4:
+// CHECK:   strong_retain %2 : $foo
+// CHECK:   strong_release %2 : $foo
+// CHECK:   br bb5(%2 : $foo)
+
+sil @jump_thread_retain_release : $@convention(thin) (Builtin.Int1, foo, foo, Builtin.Int1) -> () {
+bb0(%0 : $Builtin.Int1, %1 : $foo, %2 : $foo, %3 : $Builtin.Int1):
+  cond_br %0, bb2, bb1
+
+bb1:
+  br bb6(%2 : $foo)
+
+bb2:
+  cond_br %3, bb3, bb4
+
+bb3:
+  strong_retain %1 : $foo
+  br bb5(%1 : $foo)
+
+bb4:
+  strong_retain %2 : $foo
+  br bb5(%2 : $foo)
+
+bb5(%11 : $foo):
+  strong_release %11 : $foo
+  br bb6(%11 : $foo)
+
+bb6(%14 : $foo):
+  strong_release %14 : $foo
+  %16 = tuple ()
+  return %16 : $()
+}