[llvm-commits] [llvm] r79407 - /llvm/trunk/lib/Transforms/Utils/SSI.cpp

[Nick Lewycky]

Author: nicholas
Date: Wed Aug 19 01:24:33 2009
New Revision: 79407

URL: http://llvm.org/viewvc/llvm-project?rev=79407&view=rev
Log:
Be more careful when modifying PHI nodes. Patch by Andre Tavares.

Modified:
    llvm/trunk/lib/Transforms/Utils/SSI.cpp

Modified: llvm/trunk/lib/Transforms/Utils/SSI.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SSI.cpp?rev=79407&r1=79406&r2=79407&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SSI.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SSI.cpp Wed Aug 19 01:24:33 2009
@@ -316,7 +316,8 @@
     for (unsigned i = 0, e = PN->getNumIncomingValues(); i < e; ++i) {
       PHINode *PN_father;
       if ((PN_father = dyn_cast<PHINode>(PN->getIncomingValue(i))) &&
-          PN->getParent() == PN_father->getParent()) {
+          PN->getParent() == PN_father->getParent() &&
+          !DT_->dominates(PN->getParent(), PN->getIncomingBlock(i))) {
         BasicBlock *BB = PN->getIncomingBlock(i);
         int pos = PN_father->getBasicBlockIndex(BB);
         PN->setIncomingValue(i, PN_father->getIncomingValue(pos));