Merge pull request #35553 from atrick/fix-jumpthread-classmethod

Remove CheckedCastBrJumpThreading::Edit::modifyCFGForUnknownPreds

Author: atrick

lib/SILOptimizer/Utils/CheckedCastBrJumpThreading.cpp

@@ -86,7 +86,6 @@ class CheckedCastBrJumpThreading {
       SuccessArg(SuccessArg), InvertSuccess(InvertSuccess),
       hasUnknownPreds(hasUnknownPreds) { }
 
-    void modifyCFGForUnknownPreds();
     void modifyCFGForFailurePreds(BasicBlockCloner &Cloner);
     void modifyCFGForSuccessPreds(BasicBlockCloner &Cloner);
   };
@@ -223,24 +222,6 @@ SILValue CheckedCastBrJumpThreading::isArgValueEquivalentToCondition(
   }
 }
 
-void CheckedCastBrJumpThreading::Edit::modifyCFGForUnknownPreds() {
-  if (!hasUnknownPreds)
-    return;
-  // Check the FailureBB if it is a BB that contains a class_method
-  // referring to the same value as a condition. This pattern is typical
-  // for method chaining code like obj.method1().method2().etc()
-  auto *CCBI = cast<CheckedCastBranchInst>(CCBBlock->getTerminator());
-  SILInstruction *Inst = &*CCBI->getFailureBB()->begin();
-  if (auto *CMI = dyn_cast<ClassMethodInst>(Inst)) {
-    if (CMI->getOperand() == stripClassCasts(CCBI->getOperand())) {
-      // Replace checked_cast_br by branch to FailureBB.
-      SILBuilderWithScope(CCBI).createBranch(CCBI->getLoc(),
-                                             CCBI->getFailureBB());
-      CCBI->eraseFromParent();
-    }
-  }
-}
-
 /// Create a copy of the BB as a landing BB
 /// for all FailurePreds.
 void CheckedCastBrJumpThreading::Edit::modifyCFGForFailurePreds(
@@ -687,8 +668,6 @@ void CheckedCastBrJumpThreading::optimizeFunction() {
     // Create a copy of the BB or reuse BB as
     // a landing basic block for all SuccessPreds.
     edit->modifyCFGForSuccessPreds(Cloner);
-    // Handle unknown preds.
-    edit->modifyCFGForUnknownPreds();
 
     if (Cloner.wasCloned()) {
       Cloner.updateSSAAfterCloning();