Reverts wrong modification to MachineBlockPlacement & BranchFolding; uses a new strat...

[oota-llvm.git] / lib / CodeGen / MachineBlockPlacement.cpp

diff --git a/lib/CodeGen/MachineBlockPlacement.cpp b/lib/CodeGen/MachineBlockPlacement.cpp
index 4beaa7f396436b47825b08499c522cba4fb1a802..f5e3056450116514c2960b7c7794a248257bef1b 100644 (file)
--- a/lib/CodeGen/MachineBlockPlacement.cpp
+++ b/lib/CodeGen/MachineBlockPlacement.cpp
@@ -1271,10 +1271,7 @@ void MachineBlockPlacement::buildCFGChains(MachineFunction &F) {
       //
       bool needUpdateBr = true;
       if (!Cond.empty() && (!FBB || FBB == ChainBB)) {
-        // XXX-disabled: Don't bother with added fake conditional branches.
-        /*
         PrevBB->updateTerminator();
-        */
         needUpdateBr = false;
         Cond.clear();
         TBB = FBB = nullptr;