1 files changed, 8 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
index 7526b2ea2c9..ca2b38dce28 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -3521,8 +3521,15 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
     // happen when variable allocas are DCE'd.
     if (IntrinsicInst *SS = dyn_cast<IntrinsicInst>(II->getArgOperand(0))) {
       if (SS->getIntrinsicID() == Intrinsic::stacksave) {
-        if (&*++SS->getIterator() == II)
+        // Skip over debug info instructions.
+        // FIXME: This should be an utility in Instruction.h
+        auto It = SS->getIterator();
+        It++;
+        while (isa<DbgInfoIntrinsic>(*It))
+          It++;
+        if (&*It == II) {
           return eraseInstFromFunction(CI);
+        }
       }
     }