From: Bob Wilson <bob.wilson@apple.com>
Date: Wed, 13 May 2009 23:35:38 +0000 (+0000)
Subject: Merge adjacent conditional.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=596e22e2b3a1375bad678eb1c5e95b3188a0532b;p=oota-llvm.git

Merge adjacent conditional.


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

diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index 87d81ecf69d..93e7ff6cfb6 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -947,9 +947,7 @@ bool IfConverter::IfConvertTriangle(BBInfo &BBI, IfcvtKind Kind) {
     // Predicate the 'true' block after removing its branch.
     CvtBBI->NonPredSize -= TII->RemoveBranch(*CvtBBI->BB);
     PredicateBlock(*CvtBBI, CvtBBI->BB->end(), Cond);
-  }
 
-  if (!DupBB) {
     // Now merge the entry of the triangle with the true block.
     BBI.NonPredSize -= TII->RemoveBranch(*BBI.BB);
     MergeBlocks(BBI, *CvtBBI);