From: Eli Friedman <eli.friedman@gmail.com>
Date: Thu, 14 Jul 2011 00:22:31 +0000 (+0000)
Subject: Fix up assertion in r135018 so it doesn't trigger on 32-bit; when we're in 32-bit... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e9450107148895cd882dbaa21f17727b876998a;p=oota-llvm.git

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
---

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index d5e7dbf8ac3..c116dcbaa2d 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.