From feb50708eb48293f0b3c723df09fe5c7556c5e26 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 17 Oct 2006 14:34:02 +0000 Subject: [PATCH] add the immediate to the Offset in eliminateFrameIndex llvm-svn: 30998 --- llvm/lib/Target/ARM/ARMRegisterInfo.cpp | 4 ++-- llvm/test/Regression/CodeGen/ARM/long.ll | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Target/ARM/ARMRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMRegisterInfo.cpp index 703952367f7c..b313d548578e 100644 --- a/llvm/lib/Target/ARM/ARMRegisterInfo.cpp +++ b/llvm/lib/Target/ARM/ARMRegisterInfo.cpp @@ -106,8 +106,8 @@ ARMRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II) const { int FrameIndex = MI.getOperand(FrameIdx).getFrameIndex(); - int Offset = MF.getFrameInfo()->getObjectOffset(FrameIndex); - assert (MI.getOperand(OffIdx).getImmedValue() == 0); + int Offset = MF.getFrameInfo()->getObjectOffset(FrameIndex) + + MI.getOperand(OffIdx).getImmedValue(); unsigned StackSize = MF.getFrameInfo()->getStackSize(); diff --git a/llvm/test/Regression/CodeGen/ARM/long.ll b/llvm/test/Regression/CodeGen/ARM/long.ll index 834f06871014..b310bc00c03a 100644 --- a/llvm/test/Regression/CodeGen/ARM/long.ll +++ b/llvm/test/Regression/CodeGen/ARM/long.ll @@ -70,3 +70,10 @@ entry: %tmp2 = mul ulong %tmp1, %tmp ret ulong %tmp2 } + +ulong %f10() { +entry: + %a = alloca ulong, align 8 + %retval = load ulong* %a + ret ulong %retval +}