From 34210108b320b0ea9ccf2490690612efe702d5f6 Mon Sep 17 00:00:00 2001
From: Gerolf Hoflehner <ghoflehner@apple.com>
Date: Sat, 26 Apr 2014 01:19:16 +0000
Subject: RecursivelyDeleteTriviallyDeadInstructions() could remove more than 1
 instruction. The caller need to be aware of this and adjust instruction
 iterators accordingly.

rdar://16679376

llvm-svn: 207302
---
 llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Transforms/Scalar')

diff --git a/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp b/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp
index a61923cabf1..ab1a9393c52 100644
--- a/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp
@@ -127,7 +127,15 @@ bool LoopInstSimplify::runOnLoop(Loop *L, LPPassManager &LPM) {
             ++NumSimplified;
           }
         }
-        LocalChanged |= RecursivelyDeleteTriviallyDeadInstructions(I, TLI);
+        bool res = RecursivelyDeleteTriviallyDeadInstructions(I, TLI);
+        if (res) {
+          // RecursivelyDeleteTriviallyDeadInstruction can remove
+          // more than one instruction, so simply incrementing the
+          // iterator does not work. When instructions get deleted
+          // re-iterate instead.
+          BI = BB->begin(); BE = BB->end();
+          LocalChanged |= res;
+        }
 
         if (IsSubloopHeader && !isa<PHINode>(I))
           break;
-- 
cgit v1.2.3