Remember to update VirtRegLastUse when spilling without killing before a call.

llvm-svn: 104074
This commit is contained in:
Jakob Stoklund Olesen 2010-05-18 22:20:09 +00:00
parent 62713dac19
commit 430b6e40ab
2 changed files with 47 additions and 0 deletions

View File

@ -301,6 +301,16 @@ void RALocal::storeVirtReg(MachineBasicBlock &MBB,
DEBUG(dbgs() << " to stack slot #" << FrameIndex);
TII->storeRegToStackSlot(MBB, I, PhysReg, isKill, FrameIndex, RC, TRI);
++NumStores; // Update statistics
// Mark the spill instruction as last use if we're not killing the register.
if (!isKill) {
MachineInstr *Spill = llvm::prior(I);
int OpNum = Spill->findRegisterUseOperandIdx(PhysReg);
if (OpNum < 0)
getVirtRegLastUse(VirtReg) = std::make_pair((MachineInstr*)0, 0);
else
getVirtRegLastUse(VirtReg) = std::make_pair(Spill, OpNum);
}
}
/// spillVirtReg - This method spills the value specified by PhysReg into the

View File

@ -0,0 +1,37 @@
; RUN: llc < %s -O0 -verify-machineinstrs -regalloc=local
; RUN: llc < %s -O0 -verify-machineinstrs -regalloc=fast
; rdar://problem/7948106
;; This test would spill %R4 before the call to zz, but it forgot to move the
; 'last use' marker to the spill.
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:64:64-v128:128:128-a0:0:64-n32"
target triple = "armv6-apple-darwin"
%struct.q = type { i32, i32 }
@.str = external constant [1 x i8] ; <[1 x i8]*> [#uses=1]
define arm_apcscc void @yy(%struct.q* %qq) nounwind {
entry:
%vla6 = alloca i8, i32 undef, align 1 ; <i8*> [#uses=1]
%vla10 = alloca i8, i32 undef, align 1 ; <i8*> [#uses=1]
%vla14 = alloca i8, i32 undef, align 1 ; <i8*> [#uses=1]
%vla18 = alloca i8, i32 undef, align 1 ; <i8*> [#uses=1]
%tmp21 = load i32* undef ; <i32> [#uses=1]
%0 = mul i32 1, %tmp21 ; <i32> [#uses=1]
%vla22 = alloca i8, i32 %0, align 1 ; <i8*> [#uses=1]
call arm_apcscc void (...)* @zz(i8* getelementptr inbounds ([1 x i8]* @.str, i32 0, i32 0), i32 2, i32 1)
br i1 undef, label %if.then, label %if.end36
if.then: ; preds = %entry
%call = call arm_apcscc i32 (...)* @x(%struct.q* undef, i8* undef, i8* %vla6, i8* %vla10, i32 undef) ; <i32> [#uses=0]
%call35 = call arm_apcscc i32 (...)* @x(%struct.q* undef, i8* %vla14, i8* %vla18, i8* %vla22, i32 undef) ; <i32> [#uses=0]
unreachable
if.end36: ; preds = %entry
ret void
}
declare arm_apcscc void @zz(...)
declare arm_apcscc i32 @x(...)