commit b10b141a79502c004dd4539753aac25899b723f1
author Florian Hahn <florian.hahn@arm.com> Mon Jun 25 20:55:26 2018 +0000
committer Florian Hahn <florian.hahn@arm.com> Mon Jun 25 20:55:26 2018 +0000
tree 5258caee0285e6f9e4d3b9a3b4dd26be55f56bb4
parent 27847868b7bb4a1fcd5bf9839515171c92148c68

Revert r335513: [SCEVExp] Advance found insertion point

llvm-svn: 335522

llvm/lib/Analysis/ScalarEvolutionExpander.cpp

diff --git a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
index 43b3239..f2ce0f4 100644
--- a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
+++ b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
@@ -162,8 +162,7 @@
 
   // Cast the instruction immediately after the instruction.
   Instruction *I = cast<Instruction>(V);
-  BasicBlock::iterator IP = skipDebugInfo(
-      findInsertPointAfter(I, Builder.GetInsertBlock()));
+  BasicBlock::iterator IP = findInsertPointAfter(I, Builder.GetInsertBlock());
   return ReuseOrCreateCast(I, Ty, Op, IP);
 }
 
@@ -1481,8 +1480,8 @@
       NewOps[i] = SE.getAnyExtendExpr(S->op_begin()[i], CanonicalIV->getType());
     Value *V = expand(SE.getAddRecExpr(NewOps, S->getLoop(),
                                        S->getNoWrapFlags(SCEV::FlagNW)));
-    BasicBlock::iterator NewInsertPt = skipDebugInfo(
-        findInsertPointAfter(cast<Instruction>(V), Builder.GetInsertBlock()));
+    BasicBlock::iterator NewInsertPt =
+        findInsertPointAfter(cast<Instruction>(V), Builder.GetInsertBlock());
     V = expandCodeFor(SE.getTruncateExpr(SE.getUnknown(V), Ty), nullptr,
                       &*NewInsertPt);
     return V;