Merge pull request #34779 from atrick/fix-simplify-cfg

Fix SimplifyCFG CheckedCastBrJumpThreading.

Author: atrick

lib/SILOptimizer/Utils/CheckedCastBrJumpThreading.cpp

@@ -251,13 +251,12 @@ void CheckedCastBrJumpThreading::Edit::modifyCFGForFailurePreds(
   assert(!Cloner.wasCloned());
   Cloner.cloneBlock();
   SILBasicBlock *TargetFailureBB = Cloner.getNewBB();
-  auto *TI = TargetFailureBB->getTerminator();
-  SILBuilderWithScope Builder(TI);
-  // This BB copy branches to a FailureBB.
-  auto *CCBI = cast<CheckedCastBranchInst>(CCBBlock->getTerminator());
-  Builder.createBranch(TI->getLoc(), CCBI->getFailureBB());
-  TI->eraseFromParent();
-  splitIfCriticalEdge(CCBBlock, CCBI->getFailureBB());
+  auto *clonedCCBI =
+      cast<CheckedCastBranchInst>(TargetFailureBB->getTerminator());
+  SILBuilderWithScope Builder(clonedCCBI);
+  // This BB copy branches to the FailureBB.
+  Builder.createBranch(clonedCCBI->getLoc(), clonedCCBI->getFailureBB());
+  clonedCCBI->eraseFromParent();
 
   // Redirect all FailurePreds to the copy of BB.
   for (auto *Pred : FailurePreds) {
@@ -272,9 +271,9 @@ void CheckedCastBrJumpThreading::Edit::modifyCFGForFailurePreds(
 /// a landing basic block for all FailurePreds.
 void CheckedCastBrJumpThreading::Edit::modifyCFGForSuccessPreds(
     BasicBlockCloner &Cloner) {
-  auto *CCBI = cast<CheckedCastBranchInst>(CCBBlock->getTerminator());
 
   if (InvertSuccess) {
+    auto *CCBI = cast<CheckedCastBranchInst>(CCBBlock->getTerminator());
     SILBuilderWithScope(CCBI).createBranch(CCBI->getLoc(),
                                            CCBI->getFailureBB());
     CCBI->eraseFromParent();
@@ -287,13 +286,14 @@ void CheckedCastBrJumpThreading::Edit::modifyCFGForSuccessPreds(
       assert(!Cloner.wasCloned());
       Cloner.cloneBlock();
       SILBasicBlock *TargetSuccessBB = Cloner.getNewBB();
-      auto *TI = TargetSuccessBB->getTerminator();
-      SILBuilderWithScope Builder(TI);
+      auto *clonedCCBI =
+          cast<CheckedCastBranchInst>(TargetSuccessBB->getTerminator());
+      SILBuilderWithScope Builder(clonedCCBI);
       // This BB copy branches to SuccessBB.
       // Take argument value from the dominating BB.
-      Builder.createBranch(TI->getLoc(), CCBI->getSuccessBB(), {SuccessArg});
-      TI->eraseFromParent();
-      splitIfCriticalEdge(CCBBlock, CCBI->getSuccessBB());
+      Builder.createBranch(clonedCCBI->getLoc(), clonedCCBI->getSuccessBB(),
+                           {SuccessArg});
+      clonedCCBI->eraseFromParent();
 
       // Redirect all SuccessPreds to the copy of BB.
       for (auto *Pred : SuccessPreds) {
@@ -312,6 +312,7 @@ void CheckedCastBrJumpThreading::Edit::modifyCFGForSuccessPreds(
 
   // Add an unconditional jump at the end of the block.
   // Take argument value from the dominating BB
+  auto *CCBI = cast<CheckedCastBranchInst>(CCBBlock->getTerminator());
   SILBuilderWithScope(CCBI).createBranch(CCBI->getLoc(), CCBI->getSuccessBB(),
                                          {SuccessArg});
   CCBI->eraseFromParent();

test/SILOptimizer/simplify-cfg-debugonly.sil

@@ -0,0 +1,86 @@
+// RUN: %target-sil-opt -enable-sil-verify-all -simplify-cfg -debug-only=sil-simplify-cfg %s -o /dev/null 2>&1 | %FileCheck %s
+
+// REQUIRES: asserts
+
+import Builtin
+import Swift
+
+import Builtin
+import Swift
+
+protocol OtherKlass : class {}
+
+class Klass {}
+
+sil @getKlass : $@convention(thin) () -> @owned Klass
+
+// Verify that checked-cast jump-threading kicks in and generates verifiable SIL.
+//
+// CHECK: Condition is the same if reached over {{.*}} parent @$testCheckCastJumpThread : $@convention(thin) (@guaranteed Klass) -> @owned OtherKlass }
+// CHECK-NEXT: bb3(%{{.*}} : $OtherKlass):
+// CHECK-NEXT:   br bb5(%{{.*}} : $Klass)
+sil shared @$testCheckCastJumpThread : $@convention(thin) (@guaranteed Klass) -> @owned OtherKlass {
+bb0(%0 : $Klass):
+  %1 = function_ref @getKlass : $@convention(thin) () -> @owned Klass
+  %2 = integer_literal $Builtin.Int64, 1
+  %3 = apply %1() : $@convention(thin) () -> @owned Klass
+  checked_cast_br %3 : $Klass to OtherKlass, bb1, bb2
+
+bb1(%5 : $OtherKlass):
+  %6 = integer_literal $Builtin.Int1, -1
+  br bb3(%6 : $Builtin.Int1)
+
+bb2:
+  %8 = integer_literal $Builtin.Int1, 0
+  br bb3(%8 : $Builtin.Int1)
+
+bb3(%10 : $Builtin.Int1):
+  cond_br %10, bb5, bb6
+
+bb4:
+  unreachable
+
+bb5:
+  br bb7(%3 : $Klass)
+
+bb6:
+  strong_release %3 : $Klass
+  br bb10(%2 : $Builtin.Int64)
+
+bb7(%16 : $Klass):
+  checked_cast_br %16 : $Klass to OtherKlass, bb9, bb8
+
+bb8:
+  strong_release %16 : $Klass
+  br bb4
+
+bb9(%20 : $OtherKlass):
+  return %20 : $OtherKlass
+
+bb10(%22 : $Builtin.Int64):
+  %23 = apply %1() : $@convention(thin) () -> @owned Klass
+  checked_cast_br %23 : $Klass to OtherKlass, bb11, bb12
+
+bb11(%25 : $OtherKlass):
+  %26 = integer_literal $Builtin.Int1, -1
+  br bb13(%26 : $Builtin.Int1)
+
+bb12:
+  %28 = integer_literal $Builtin.Int1, 0
+  br bb13(%28 : $Builtin.Int1)
+
+bb13(%30 : $Builtin.Int1):
+  cond_br %30, bb14, bb15
+
+bb14:
+  br bb7(%23 : $Klass)
+
+bb15:
+  cond_br undef, bb16, bb17
+
+bb16:
+  br bb4
+
+bb17:
+  br bb10(undef : $Builtin.Int64)
+}