Revert commit 142891. Takumi bisected the tablegen miscompiles

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

diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp
index 2c39f64998c6645d674288713c2ebc19676438b0..75288b0934cbe55b7b34c1c4053ecf0c1892114b 100644 (file)
--- a/lib/CodeGen/BranchFolding.cpp
+++ b/lib/CodeGen/BranchFolding.cpp
@@ -913,8 +913,7 @@ bool BranchFolder::TailMergeBlocks(MachineFunction &MF) {
               // reinsert conditional branch only, for now
               TII->InsertBranch(*PBB, (TBB == IBB) ? FBB : TBB, 0, NewCond, dl);
           }
-          if (!PBB->getLandingPadSuccessor())
-            MergePotentials.push_back(MergePotentialsElt(HashEndOfMBB(PBB),*P));
+          MergePotentials.push_back(MergePotentialsElt(HashEndOfMBB(PBB), *P));
         }
       }
       // If this is a large problem, avoid visiting the same basic blocks