[llvm-branch-commits] [llvm-branch] r102566 - /llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp

[Evan Cheng]

Author: evancheng
Date: Wed Apr 28 18:55:45 2010
New Revision: 102566

URL: http://llvm.org/viewvc/llvm-project?rev=102566&view=rev
Log:
Merge 102565.

Modified:
    llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=102566&r1=102565&r2=102566&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/LiveIntervalAnalysis.cpp Wed Apr 28 18:55:45 2010
@@ -1297,11 +1297,12 @@
     ++ri;
     if (MI->isDebugValue()) {
       // Modify DBG_VALUE now that the value is in a spill slot.
-      if (Slot == VirtRegMap::NO_STACK_SLOT) {
+      if (Slot != VirtRegMap::MAX_STACK_SLOT || isLoadSS) {
         uint64_t Offset = MI->getOperand(1).getImm();
         const MDNode *MDPtr = MI->getOperand(2).getMetadata();
         DebugLoc DL = MI->getDebugLoc();
-        if (MachineInstr *NewDV = tii_->emitFrameIndexDebugValue(*mf_, Slot,
+        int FI = isLoadSS ? LdSlot : (int)Slot;
+        if (MachineInstr *NewDV = tii_->emitFrameIndexDebugValue(*mf_, FI,
                                                            Offset, MDPtr, DL)) {
           DEBUG(dbgs() << "Modifying debug info due to spill:" << "\t" << *MI);
           ReplaceMachineInstrInMaps(MI, NewDV);