commit 1e94ed606ef5e3253fde50eaf0f39a26530b5c16
author Chris Lattner <sabre@nondot.org> Sun May 02 01:00:44 2004 +0000
committer Chris Lattner <sabre@nondot.org> Sun May 02 01:00:44 2004 +0000
tree a31e846de2e75fb118945b005e5dffb2e7d11a67
parent 2e93c4275ef42f4e51a5eba11de38a1b6633520b

Dont' merge terminators that are needed to select PHI node values.

llvm-svn: 13312

llvm/lib/Transforms/Utils/SimplifyCFG.cpp

diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index dedaa6a..a1b917f 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -812,7 +812,7 @@
 
           for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI!=E; ++PI)
             if (BranchInst *PBI = dyn_cast<BranchInst>((*PI)->getTerminator()))
-              if (PBI->isConditional()) {
+              if (PBI->isConditional() && SafeToMergeTerminators(BI, PBI)) {
                 if (PBI->getSuccessor(0) == FalseDest ||
                     PBI->getSuccessor(1) == TrueDest) {
                   // Invert the predecessors condition test (xor it with true),