From 465c07cc66e572249dbe8b2bb8fce6114bc9959f Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Mon, 15 Nov 2010 21:51:51 +0000 Subject: [PATCH] Revert "Fix PR8612 in the standard spiller as well." This reverts r119183 which borke the buildbots. llvm-svn: 119270 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 6 +----- test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index b77d43fe9a8..aa2f9658874 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -1136,14 +1136,11 @@ rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI, 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 @@ rewriteInstructionForSpills(const LiveInterval &li, const VNInfo *VNI, } } 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); diff --git a/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll b/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll index 04220949027..046016aa3f3 100644 --- a/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll +++ b/test/CodeGen/ARM/2010-11-15-SpillEarlyClobber.ll @@ -1,4 +1,3 @@ -; RUN: llc < %s -verify-machineinstrs -spiller=standard ; RUN: llc < %s -verify-machineinstrs -spiller=inline ; PR8612 ;