[llvm-branch-commits] [llvm-branch] r85439 - /llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp

[Bill Wendling]

Author: void
Date: Wed Oct 28 17:03:16 2009
New Revision: 85439

URL: http://llvm.org/viewvc/llvm-project?rev=85439&view=rev
Log:
$ svn merge -c 85437 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85437 into '.':
U    lib/CodeGen/VirtRegRewriter.cpp


Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp?rev=85439&r1=85438&r2=85439&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/VirtRegRewriter.cpp Wed Oct 28 17:03:16 2009
@@ -1431,6 +1431,7 @@
                            std::vector<MachineOperand*> &KillOps,
                            VirtRegMap &VRM) {
 
+    MachineBasicBlock::iterator oldNextMII = next(MII);
     TII->storeRegToStackSlot(MBB, next(MII), PhysReg, true, StackSlot, RC);
     MachineInstr *StoreMI = next(MII);
     VRM.addSpillSlotUse(StackSlot, StoreMI);
@@ -1467,7 +1468,9 @@
       }
     }
 
-    LastStore = next(MII);
+    // Allow for multi-instruction spill sequences, as on PPC Altivec.  Presume
+    // the last of multiple instructions is the actual store.
+    LastStore = prior(oldNextMII);
 
     // If the stack slot value was previously available in some other
     // register, change it now.  Otherwise, make the register available,