diff options
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 19 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-12-23-crazy-address.ll | 33 |
2 files changed, 46 insertions, 6 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index b650d22050..a0d8b58b78 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -454,12 +454,19 @@ void X86RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, // FrameIndex with base register with EBP. Add an offset to the offset. MI.getOperand(i).ChangeToRegister(BasePtr, false); - // Now add the frame object offset to the offset from EBP. Offset is a - // 32-bit integer. - int Offset = getFrameIndexOffset(MF, FrameIndex) + - (int)(MI.getOperand(i+3).getImm()); - - MI.getOperand(i+3).ChangeToImmediate(Offset); + // Now add the frame object offset to the offset from EBP. + if (MI.getOperand(i+3).isImm()) { + // Offset is a 32-bit integer. + int Offset = getFrameIndexOffset(MF, FrameIndex) + + (int)(MI.getOperand(i+3).getImm()); + + MI.getOperand(i+3).ChangeToImmediate(Offset); + } else { + // Offset is symbolic. This is extremely rare. + uint64_t Offset = getFrameIndexOffset(MF, FrameIndex) + + (uint64_t)MI.getOperand(i+3).getOffset(); + MI.getOperand(i+3).setOffset(Offset); + } } void diff --git a/test/CodeGen/X86/2008-12-23-crazy-address.ll b/test/CodeGen/X86/2008-12-23-crazy-address.ll new file mode 100644 index 0000000000..e53a91ec3a --- /dev/null +++ b/test/CodeGen/X86/2008-12-23-crazy-address.ll @@ -0,0 +1,33 @@ +; RUN: llvm-as < %s | llc -march=x86 -relocation-model=static | grep {lea.*X.*esp} | count 2 + +@X = external global [0 x i32] + +define void @foo() nounwind { +entry: + %Y = alloca i32 + call void @frob(i32* %Y) nounwind + %Y3 = bitcast i32* %Y to i8* + %ctg2 = getelementptr i8* %Y3, i32 ptrtoint ([0 x i32]* @X to i32) + %0 = ptrtoint i8* %ctg2 to i32 + call void @borf(i32 %0) nounwind + ret void +} + +define void @bar(i32 %i) nounwind { +entry: + %Y = alloca [10 x i32] + %0 = getelementptr [10 x i32]* %Y, i32 0, i32 0 + call void @frob(i32* %0) nounwind + %1 = getelementptr [0 x i32]* @X, i32 0, i32 %i + %2 = getelementptr [10 x i32]* %Y, i32 0, i32 0 + %3 = ptrtoint i32* %2 to i32 + %4 = bitcast i32* %1 to i8* + %ctg2 = getelementptr i8* %4, i32 %3 + %5 = ptrtoint i8* %ctg2 to i32 + call void @borf(i32 %5) nounwind + ret void +} + +declare void @frob(i32*) + +declare void @borf(i32) |