From 198b8e78c3cea8f89d22c8fcb83cf22ae96d2aa3 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 24 Dec 2008 00:27:51 +0000 Subject: Fix a compiler-abort on a testcase where the stack-pointer is added to a symbolic constant. This is unlikely to be intentional, but it shouldn't crash the compiler. llvm-svn: 61408 --- llvm/lib/Target/X86/X86RegisterInfo.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'llvm/lib/Target/X86/X86RegisterInfo.cpp') diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index b650d220507..a0d8b58b789 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/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 -- cgit v1.2.3