[llvm-commits] [llvm] r107503 - /llvm/trunk/lib/CodeGen/InlineSpiller.cpp
Jakob Stoklund Olesen
stoklund at 2pi.dk
Fri Jul 2 12:54:40 PDT 2010
Author: stoklund
Date: Fri Jul 2 14:54:40 2010
New Revision: 107503
URL: http://llvm.org/viewvc/llvm-project?rev=107503&view=rev
Log:
Properly handle debug values during inline spilling.
Modified:
llvm/trunk/lib/CodeGen/InlineSpiller.cpp
Modified: llvm/trunk/lib/CodeGen/InlineSpiller.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/InlineSpiller.cpp?rev=107503&r1=107502&r2=107503&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/InlineSpiller.cpp (original)
+++ llvm/trunk/lib/CodeGen/InlineSpiller.cpp Fri Jul 2 14:54:40 2010
@@ -245,20 +245,21 @@
return;
// Removing values may cause debug uses where li_ is not live.
- for (MachineRegisterInfo::use_iterator
- RI = mri_.use_begin(li_->reg), RE = mri_.use_end(); RI != RE;) {
- MachineOperand &MO = RI.getOperand();
- MachineInstr *MI = MO.getParent();
- ++RI;
- SlotIndex UseIdx = lis_.getInstructionIndex(MI).getUseIndex();
- DEBUG(dbgs() << "\tremaining use: " << UseIdx << '\t' << *MI);
- if (li_->liveAt(UseIdx))
+ for (MachineRegisterInfo::use_iterator RI = mri_.use_begin(li_->reg);
+ MachineInstr *MI = RI.skipInstruction();) {
+ if (!MI->isDebugValue())
continue;
- assert(MI->isDebugValue() && "Remaining non-debug use after remat dead.");
- if (li_->empty())
- MO.setIsUndef();
- else
- MO.setReg(0);
+ // Try to preserve the debug value if li_ is live immediately after it.
+ MachineBasicBlock::iterator NextMI = MI;
+ ++NextMI;
+ if (NextMI != MI->getParent()->end() && !lis_.isNotInMIMap(NextMI)) {
+ SlotIndex NearIdx = lis_.getInstructionIndex(NextMI);
+ if (li_->liveAt(NearIdx))
+ continue;
+ }
+ DEBUG(dbgs() << "Removing debug info due to remat:" << "\t" << *MI);
+ assert(&*RI != MI && "Multiple register operands on debug value");
+ MI->eraseFromParent();
}
}
@@ -348,6 +349,24 @@
for (MachineRegisterInfo::reg_iterator RI = mri_.reg_begin(li->reg);
MachineInstr *MI = RI.skipInstruction();) {
+ // Debug values are not allowed to affect codegen.
+ if (MI->isDebugValue()) {
+ // Modify DBG_VALUE now that the value is in a spill slot.
+ uint64_t Offset = MI->getOperand(1).getImm();
+ const MDNode *MDPtr = MI->getOperand(2).getMetadata();
+ DebugLoc DL = MI->getDebugLoc();
+ if (MachineInstr *NewDV = tii_.emitFrameIndexDebugValue(mf_, stackSlot_,
+ Offset, MDPtr, DL)) {
+ DEBUG(dbgs() << "Modifying debug info due to spill:" << "\t" << *MI);
+ MachineBasicBlock *MBB = MI->getParent();
+ MBB->insert(MBB->erase(MI), NewDV);
+ } else {
+ DEBUG(dbgs() << "Removing debug info due to spill:" << "\t" << *MI);
+ MI->eraseFromParent();
+ }
+ continue;
+ }
+
// Analyze instruction.
bool Reads, Writes;
SmallVector<unsigned, 8> Ops;
More information about the llvm-commits
mailing list