Firstly, having a BranchInst isn't exclusive with having an unwind_to.

Secondly, we have to check whether the branch is actually pointing to the block
with the unwind in it. We could have gotten here because of the unwind_to alone.

llvm-svn: 48099

llvm/lib/Transforms/Utils/SimplifyCFG.cpp

@@ -1364,13 +1364,19 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
     SmallVector<BasicBlock*, 8> Preds(pred_begin(BB), pred_end(BB));
     while (!Preds.empty()) {
       BasicBlock *Pred = Preds.back();
+
+      if (Pred->getUnwindDest() == BB) {
+        Pred->setUnwindDest(NULL);
+        Changed = true;
+      }
+
       if (BranchInst *BI = dyn_cast<BranchInst>(Pred->getTerminator())) {
-        if (BI->isUnconditional()) {
+        if (BI->isUnconditional() && BI->getSuccessor(0) == BB) {
           Pred->getInstList().pop_back();  // nuke uncond branch
           new UnwindInst(Pred);            // Use unwind.
           Changed = true;
         }
-      } else if (InvokeInst *II = dyn_cast<InvokeInst>(Pred->getTerminator())) {
+      } else if (InvokeInst *II = dyn_cast<InvokeInst>(Pred->getTerminator()))
         if (II->getUnwindDest() == BB) {
           // Insert a new branch instruction before the invoke, because this
           // is now a fall through...
@@ -1388,9 +1394,6 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
           delete II;
           Changed = true;
         }
-      } else if (Pred->getUnwindDest() == BB) {
-        Pred->setUnwindDest(NULL);
-      }
 
       Preds.pop_back();
     }

llvm/test/Transforms/SimplifyCFG/unwindto.ll

@@ -41,3 +41,21 @@ entry: unwind_to %cleanup
 cleanup:
   unwind
 }
+
+define i32 @f4() {
+entry: unwind_to %cleanup
+  call void @g(i32 0)
+  br label %cleanup
+cleanup:
+  unwind
+}
+
+define i32 @f5() {
+entry: unwind_to %cleanup
+  call void @g(i32 0)
+  br label %other
+other:
+  ret i32 0
+cleanup:
+  unwind
+}