From: Evan Cheng <evan.cheng@apple.com>
Date: Fri, 18 May 2007 17:06:53 +0000 (+0000)
Subject: Watch out for blocks that end with a return.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6092ca155610b6c4cb16f21a1dad1f990758730a;p=oota-llvm.git

Watch out for blocks that end with a return.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37227 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index a98f04b1ef2..a93175ec414 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -316,7 +316,7 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
 
     // Either the 'true' block fallthrough to another block or it ends with a
     // return. If it's the former, add a conditional branch to its successor.
-    if (!TrueBBI.TrueBB)
+    if (!TrueBBI.TrueBB && BBI.TrueBB->succ_size())
       TII->InsertBranch(*BBI.TrueBB, *BBI.TrueBB->succ_begin(), NULL, BBI.Cond);
 
     // Predicate the 'false' block.
@@ -326,7 +326,7 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
 
     // Either the 'false' block fallthrough to another block or it ends with a
     // return. If it's the former, add a conditional branch to its successor.
-    if (!FalseBBI.TrueBB)
+    if (!FalseBBI.TrueBB && BBI.FalseBB->succ_size())
       TII->InsertBranch(*BBI.FalseBB, *BBI.FalseBB->succ_begin(), NULL,NewCond);
 
     // Merge the 'true' and 'false' blocks by copying the instructions