diff --git a/llvm/lib/Analysis/MemorySSA.cpp b/llvm/lib/Analysis/MemorySSA.cpp
--- a/llvm/lib/Analysis/MemorySSA.cpp
+++ b/llvm/lib/Analysis/MemorySSA.cpp
@@ -2625,21 +2625,18 @@
 }
 
 bool upward_defs_iterator::IsGuaranteedLoopInvariant(const Value *Ptr) const {
-  auto IsGuaranteedLoopInvariantBase = [](const Value *Ptr) {
-    Ptr = Ptr->stripPointerCasts();
-    if (!isa<Instruction>(Ptr))
-      return true;
-    return isa<AllocaInst>(Ptr);
-  };
-
   Ptr = Ptr->stripPointerCasts();
   if (auto *I = dyn_cast<Instruction>(Ptr)) {
     if (I->getParent()->isEntryBlock())
       return true;
   }
+
   if (auto *GEP = dyn_cast<GEPOperator>(Ptr)) {
-    return IsGuaranteedLoopInvariantBase(GEP->getPointerOperand()) &&
+    return IsGuaranteedLoopInvariant(GEP->getPointerOperand()) &&
            GEP->hasAllConstantIndices();
   }
-  return IsGuaranteedLoopInvariantBase(Ptr);
+
+  if (!isa<Instruction>(Ptr))
+    return true;
+  return isa<AllocaInst>(Ptr);
 }
diff --git a/llvm/test/Analysis/MemorySSA/loop-invariant.ll b/llvm/test/Analysis/MemorySSA/loop-invariant.ll
--- a/llvm/test/Analysis/MemorySSA/loop-invariant.ll
+++ b/llvm/test/Analysis/MemorySSA/loop-invariant.ll
@@ -4,7 +4,7 @@
 ; %p2 is a loop invariant and the MemoryLoc of load instr and store inst in
 ; loop block are NoAlias
 ;
-; CHECK: MemoryUse(2)
+; CHECK: MemoryUse(liveOnEntry)
 ; CHECK: %val = load i32, ptr %p2
 define void @gep(ptr %ptr) {
 entry:
@@ -24,7 +24,8 @@
   br label %loop
 }
 
-; CHECK: MemoryUse(2)
+; CHECK: %x = phi i32 [ 0, %tmp ], [ %x.inc, %loop ]
+; CHECK-NEXT: MemoryUse(liveOnEntry)
 ; CHECK-NEXT: %val = load i32, ptr %p2
 define void @load_entry_block(ptr %ptr, ptr %addr) {
 entry: