reenable factoring of GEP expressions, being more precise about the

case that it bad to do.

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

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 448637abf65db3661865e0aac3ce0d9dda941a9b..36218f02dcf2cfe81c591f9729a2df702aafc81c 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -6788,12 +6788,17 @@ Instruction *InstCombiner::FoldPHIArgBinOpIntoPHI(PHINode &PN) {
     if (I->getOperand(1) != RHSVal) RHSVal = 0;
   }
   
-  // Otherwise, this is safe and profitable to transform.  Create up to two phi
-  // nodes.
-  PHINode *NewLHS = 0, *NewRHS = 0;
+  // Otherwise, this is safe to transform, determine if it is profitable.
+
+  // If this is a GEP, and if the index (not the pointer) needs a PHI, bail out.
+  // Indexes are often folded into load/store instructions, so we don't want to
+  // hide them behind a phi.
+  if (isa<GetElementPtrInst>(FirstInst) && RHSVal == 0)
+    return 0;
+  
   Value *InLHS = FirstInst->getOperand(0);
   Value *InRHS = FirstInst->getOperand(1);
-  
+  PHINode *NewLHS = 0, *NewRHS = 0;
   if (LHSVal == 0) {
     NewLHS = new PHINode(LHSType, FirstInst->getOperand(0)->getName()+".pn");
     NewLHS->reserveOperandSpace(PN.getNumOperands()/2);
@@ -6875,7 +6880,7 @@ Instruction *InstCombiner::FoldPHIArgOpIntoPHI(PHINode &PN) {
         !isSafeToSinkLoad(LI))
       return 0;
   } else if (isa<GetElementPtrInst>(FirstInst)) {
-    if (0 && FirstInst->getNumOperands() == 2)
+    if (FirstInst->getNumOperands() == 2)
       return FoldPHIArgBinOpIntoPHI(PN);
     // Can't handle general GEPs yet.
     return 0;