commit e18f92bfe956e9229a81473ed29e9a577177a77a
author Reid Kleckner <rnk@google.com> Tue Dec 08 22:33:23 2015 +0000
committer Reid Kleckner <rnk@google.com> Tue Dec 08 22:33:23 2015 +0000
tree 4065527a1a414a1f860015794cf1c62423e35d72
parent 8a954a055339f431409560658159cb50697f46a2

Revert "[CGP] Check that we have an insert point before moving llvm.dbg.value around"

This reverts commit r255055.

Breakage has been reported.

llvm-svn: 255063

llvm/lib/CodeGen/CodeGenPrepare.cpp

diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 615bcf3..d619044 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -5251,16 +5251,12 @@
 
       Instruction *VI = dyn_cast_or_null<Instruction>(DVI->getValue());
       if (VI && VI != PrevNonDbgInst && !VI->isTerminator()) {
-        BasicBlock::iterator IP;
-        if (isa<PHINode>(VI))
-          IP = VI->getParent()->getFirstInsertionPt();
-        else
-          IP = ++VI->getIterator();
-        if (IP == VI->getParent()->end())
-          continue;
         DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI);
         DVI->removeFromParent();
-        VI->getParent()->getInstList().insert(IP, DVI);
+        if (isa<PHINode>(VI))
+          DVI->insertBefore(&*VI->getParent()->getFirstInsertionPt());
+        else
+          DVI->insertAfter(VI);
         MadeChange = true;
         ++NumDbgValueMoved;
       }