[llvm-commits] [llvm] r114634 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

[Evan Cheng]

Author: evancheng
Date: Thu Sep 23 02:18:35 2010
New Revision: 114634

URL: http://llvm.org/viewvc/llvm-project?rev=114634&view=rev
Log:
Follow up to r114630. Do not optimize away unconditional branch following a conditional one.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=114634&r1=114633&r2=114634&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Sep 23 02:18:35 2010
@@ -1617,9 +1617,8 @@
                                 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 @@
   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);
 }