[llvm-commits] [llvm] r119270 - in /llvm/trunk: lib/CodeGen/LiveIntervalAnalysis.cpp test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll

[Jakob Stoklund Olesen]

Author: stoklund
Date: Mon Nov 15 15:51:51 2010
New Revision: 119270

URL: http://llvm.org/viewvc/llvm-project?rev=119270&view=rev
Log:
Revert "Fix PR8612 in the standard spiller as well."

This reverts r119183 which borke the buildbots.

Modified:
    llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
    llvm/trunk/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll

Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=119270&r1=119269&r2=119270&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Mon Nov 15 15:51:51 2010
@@ -1136,14 +1136,11 @@
       rewriteImplicitOps(li, MI, NewVReg, vrm);
 
     // Reuse NewVReg for other reads.
-    bool HasEarlyClobber = false;
     for (unsigned j = 0, e = Ops.size(); j != e; ++j) {
       MachineOperand &mopj = MI->getOperand(Ops[j]);
       mopj.setReg(NewVReg);
       if (mopj.isImplicit())
         rewriteImplicitOps(li, MI, NewVReg, vrm);
-      if (mopj.isEarlyClobber())
-        HasEarlyClobber = true;
     }
 
     if (CreatedNewVReg) {
@@ -1202,8 +1199,7 @@
       }
     }
     if (HasDef) {
-      LiveRange LR(HasEarlyClobber ? index.getUseIndex() : index.getDefIndex(),
-                   index.getStoreIndex(),
+      LiveRange LR(index.getDefIndex(), index.getStoreIndex(),
                    nI.getNextValue(SlotIndex(), 0, VNInfoAllocator));
       DEBUG(dbgs() << " +" << LR);
       nI.addRange(LR);

Modified: llvm/trunk/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll?rev=119270&r1=119269&r2=119270&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll Mon Nov 15 15:51:51 2010
@@ -1,4 +1,3 @@
-; RUN: llc < %s -verify-machineinstrs -spiller=standard
 ; RUN: llc < %s -verify-machineinstrs -spiller=inline
 ; PR8612
 ;