[llvm] r217260 - Set the parent pointer of cloned DBG_VALUE instructions correctly.

Adrian Prantl aprantl at apple.com
Fri Sep 5 10:10:10 PDT 2014

Author: adrian
Date: Fri Sep  5 12:10:10 2014
New Revision: 217260

URL: http://llvm.org/viewvc/llvm-project?rev=217260&view=rev
Set the parent pointer of cloned DBG_VALUE instructions correctly.
Fixes PR20523.

When spilling variables onto the stack, spillVirtReg() is setting the
parent pointer of the cloned DBG_VALUE intrinsic for the stack location
to the parent pointer of the original intrinsic. MachineInstr parent
pointers should however always point to the parent basic block.

MBB is shadowing the MBB member variable. The instruction still ends up
being inserted into the right basic block, because it's inserted after MI
which serves as the iterator.

I failed at constructing a reliable testcase for this, see
http://llvm.org/bugs/show_bug.cgi?id=20523 for a large testcases.


Modified: llvm/trunk/lib/CodeGen/RegAllocFast.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocFast.cpp?rev=217260&r1=217259&r2=217260&view=diff
--- llvm/trunk/lib/CodeGen/RegAllocFast.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegAllocFast.cpp Fri Sep  5 12:10:10 2014
@@ -309,10 +309,10 @@ void RAFast::spillVirtReg(MachineBasicBl
         DL = (--EI)->getDebugLoc();
       } else
         DL = MI->getDebugLoc();
-      MachineBasicBlock *MBB = DBG->getParent();
       MachineInstr *NewDV =
           BuildMI(*MBB, MI, DL, TII->get(TargetOpcode::DBG_VALUE))
+      assert(NewDV->getParent() == MBB && "dangling parent pointer");
       DEBUG(dbgs() << "Inserting debug info due to spill:" << "\n" << *NewDV);

More information about the llvm-commits mailing list