Fix some problems in SpeculativelyExecuteBB. Basically,

because of dead code, a phi could use the speculated instruction
that was not in "BB2".  Make this check explicit and tighten up
some other corners.  This fixes PR3292.  No testcase becauase this
depends entirely on visitation order of blocks and requires a
sequence of 8 passes to repro.

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

diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 1a0b0b4..2bd3209 100644 (file)
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -984,6 +984,12 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
       return false;
     break;   // These are all cheap and non-trapping instructions.
   }
+  
+  // If the instruction is obviously dead, don't try to predicate it.
+  if (I->use_empty()) {
+    I->eraseFromParent();
+    return true;
+  }
 
   // Can we speculatively execute the instruction? And what is the value 
   // if the condition is false? Consider the phi uses, if the incoming value
@@ -992,20 +998,25 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
   BasicBlock *BIParent = BI->getParent();
   SmallVector<PHINode*, 4> PHIUses;
   Value *FalseV = NULL;
+  
+  BasicBlock *BB2 = BB1->getTerminator()->getSuccessor(0);
   for (Value::use_iterator UI = I->use_begin(), E = I->use_end();
        UI != E; ++UI) {
+    // Ignore any user that is not a PHI node in BB2.  These can only occur in
+    // unreachable blocks, because they would not be dominated by the instr.
     PHINode *PN = dyn_cast<PHINode>(UI);
-    if (!PN)
-      continue;
+    if (!PN || PN->getParent() != BB2)
+      return false;
     PHIUses.push_back(PN);
+    
     Value *PHIV = PN->getIncomingValueForBlock(BIParent);
     if (!FalseV)
       FalseV = PHIV;
     else if (FalseV != PHIV)
-      return false;  // Don't know the value when condition is false.
+      return false;  // Inconsistent value when condition is false.
   }
-  if (!FalseV)  // Can this happen?
-    return false;
+  
+  assert(FalseV && "Must have at least one user, and it must be a PHI");
 
   // Do not hoist the instruction if any of its operands are defined but not
   // used in this BB. The transformation will prevent the operand from