-#ifndef GENERIC_VALUE_H
-#define GENERIC_VALUE_H
-
-#include "Support/DataTypes.h"
-
-typedef uint64_t PointerTy;
-
-union GenericValue {
- bool BoolVal;
- unsigned char UByteVal;
- signed char SByteVal;
- unsigned short UShortVal;
- signed short ShortVal;
- unsigned int UIntVal;
- signed int IntVal;
- uint64_t ULongVal;
- int64_t LongVal;
- double DoubleVal;
- float FloatVal;
- PointerTy PointerVal;
- unsigned char Untyped[8];
-
- GenericValue() {}
- GenericValue(void *V) {
- PointerVal = (PointerTy)(intptr_t)V;
- }
+#ifndef LLVM_EXECUTIONENGINE_GENERICVALUE_H
+#define LLVM_EXECUTIONENGINE_GENERICVALUE_H
+
+#include "llvm/ADT/APInt.h"
+#include "llvm/Support/DataTypes.h"
+
+namespace llvm {
+
+typedef void* PointerTy;
+class APInt;
+
+struct GenericValue {
+ union {
+ double DoubleVal;
+ float FloatVal;
+ PointerTy PointerVal;
+ struct { unsigned int first; unsigned int second; } UIntPairVal;
+ unsigned char Untyped[8];
+ };
+ APInt IntVal; // also used for long doubles
+
+ GenericValue() : DoubleVal(0.0), IntVal(1,0) {}
+ explicit GenericValue(void *V) : PointerVal(V), IntVal(1,0) { }