Fix a really horrible problem that causes the JIT to miscompile any program

that use 64-bit integers on 32-bit hosts.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21886 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index 22a28b51c85f67d61faa72cd174f52b6681f7472..97384dbba6b9c791ee590074058eb407b0805717 100644 (file)
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -271,8 +271,8 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
     GET_CONST_VAL(Short  , signed short  , ConstantSInt);
     GET_CONST_VAL(UInt   , unsigned int  , ConstantUInt);
     GET_CONST_VAL(Int    , signed int    , ConstantSInt);
-    GET_CONST_VAL(ULong  , unsigned long , ConstantUInt);
-    GET_CONST_VAL(Long   , signed long   , ConstantSInt);
+    GET_CONST_VAL(ULong  , uint64_t      , ConstantUInt);
+    GET_CONST_VAL(Long   , int64_t       , ConstantSInt);
     GET_CONST_VAL(Float  , float         , ConstantFP);
     GET_CONST_VAL(Double , double        , ConstantFP);
 #undef GET_CONST_VAL