Fix PR1657

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

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp
index ac927da07e..6c5976ad3a 100644
--- a/lib/Transforms/Scalar/LICM.cpp
+++ b/lib/Transforms/Scalar/LICM.cpp
@@ -791,6 +791,14 @@ void LICM::FindPromotableValuesInLoop(
           break;
         }
 
+      // If GEP base is NULL then the calculated address  used by Store or
+      // Load instruction is invalid. Do not promote this value because
+      // it may expose load and store instruction that are covered by
+      // condition which may not yet folded.
+      if (GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(V))
+        if (isa<ConstantPointerNull>(GEP->getOperand(0)))
+          PointerOk = false;
+
       if (PointerOk) {
         const Type *Ty = cast<PointerType>(V->getType())->getElementType();
         AllocaInst *AI = new AllocaInst(Ty, 0, V->getName()+".tmp", FnStart);