From: Evan Cheng <evan.cheng@apple.com>
Date: Thu, 23 Sep 2010 07:18:35 +0000 (+0000)
Subject: Follow up to r114630. Do not optimize away unconditional branch following a condition... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b8db1981b8cdd7cc52a9ad94a12c73e4fb1e8b39;p=oota-llvm.git

Follow up to r114630. Do not optimize away unconditional branch following a conditional one.

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

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index f3bc50d490e..10095c5d3e8 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -1617,9 +1617,8 @@ void SelectionDAGBuilder::visitBitTestHeader(BitTestBlock &B,
                                 MVT::Other, CopyTo, RangeCmp,
                                 DAG.getBasicBlock(B.Default));
 
-  if (MBB != NextBlock)
-    BrRange = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, CopyTo,
-                          DAG.getBasicBlock(MBB));
+  BrRange = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, CopyTo,
+                        DAG.getBasicBlock(MBB));
 
   DAG.setRoot(BrRange);
 }
@@ -1672,9 +1671,8 @@ void SelectionDAGBuilder::visitBitTestCase(MachineBasicBlock* NextMBB,
   if (++BBI != FuncInfo.MF->end())
     NextBlock = BBI;
 
-  if (NextMBB != NextBlock)
-    BrAnd = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, BrAnd,
-                        DAG.getBasicBlock(NextMBB));
+  BrAnd = DAG.getNode(ISD::BR, getCurDebugLoc(), MVT::Other, BrAnd,
+                      DAG.getBasicBlock(NextMBB));
 
   DAG.setRoot(BrAnd);
 }