aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/X86/X86RegisterInfo.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-07-14 00:22:31 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-07-14 00:22:31 +0000
commit7e9450107148895cd882dbaa21f17727b876998a (patch)
tree84f08aa3feb20f087d8bbca14ad08da6bc9bb6dc /lib/Target/X86/X86RegisterInfo.cpp
parent00a66653cbe56dfbdb831172b54097bf8256a191 (diff)
downloadexternal_llvm-7e9450107148895cd882dbaa21f17727b876998a.zip
external_llvm-7e9450107148895cd882dbaa21f17727b876998a.tar.gz
external_llvm-7e9450107148895cd882dbaa21f17727b876998a.tar.bz2
Fix up assertion in r135018 so it doesn't trigger on 32-bit; when we're in 32-bit, it doesn't matter whether the operation overflows because the computed address is not wider than the immediate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135120 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86RegisterInfo.cpp')
-rw-r--r--lib/Target/X86/X86RegisterInfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index d5e7dbf..c116dcb 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -732,7 +732,8 @@ X86RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
// Offset is a 32-bit integer.
int Imm = (int)(MI.getOperand(i + 3).getImm());
int Offset = FIOffset + Imm;
- assert(isInt<32>((long long)FIOffset + Imm) && "Overflowing offset!");
+ assert((!Is64Bit || isInt<32>((long long)FIOffset + Imm)) &&
+ "Requesting 64-bit offset in 32-bit immediate!");
MI.getOperand(i + 3).ChangeToImmediate(Offset);
} else {
// Offset is symbolic. This is extremely rare.