From 7c005324d57ce908afb4dc01031850db70e3f4fc Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 8 Dec 2015 21:50:52 +0000 Subject: [CGP] Check that we have an insert point before moving llvm.dbg.value around llvm-svn: 255055 --- llvm/lib/CodeGen/CodeGenPrepare.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp index d619044e86c..615bcf33767 100644 --- a/llvm/lib/CodeGen/CodeGenPrepare.cpp +++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp @@ -5251,12 +5251,16 @@ bool CodeGenPrepare::placeDbgValues(Function &F) { Instruction *VI = dyn_cast_or_null(DVI->getValue()); if (VI && VI != PrevNonDbgInst && !VI->isTerminator()) { - DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI); - DVI->removeFromParent(); + BasicBlock::iterator IP; if (isa(VI)) - DVI->insertBefore(&*VI->getParent()->getFirstInsertionPt()); + IP = VI->getParent()->getFirstInsertionPt(); else - DVI->insertAfter(VI); + 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); MadeChange = true; ++NumDbgValueMoved; } -- cgit v1.2.3