[llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.38 -> 1.39

---
Log message:

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


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.38 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.39
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.38	Sat May  1 18:35:43 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May  1 20:00:44 2004
@@ -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),