Switch to using APInt math operations.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/include/klee/Expr.h b/include/klee/Expr.h
index fea269e8..bfe839d8 100644
--- a/include/klee/Expr.h
+++ b/include/klee/Expr.h
@@ -299,7 +299,13 @@ public:
 private:
   llvm::APInt value;
 
-  ConstantExpr(uint64_t v, Width w) : value(w, v) {}
+  ConstantExpr(const llvm::APInt &v) : value(v) {}
+
+  static ref<ConstantExpr> alloc(const llvm::APInt &v) {
+    ref<ConstantExpr> r(new ConstantExpr(v));
+    r->computeHash();
+    return r;
+  }
 
 public:
   ~ConstantExpr() {};
@@ -351,7 +357,7 @@ public:
 
   static ref<ConstantExpr> alloc(uint64_t v, Width w) {
     // constructs an "optimized" ConstantExpr
-    ref<ConstantExpr> r(new ConstantExpr(v, w));
+    ref<ConstantExpr> r(new ConstantExpr(llvm::APInt(w, v)));
     r->computeHash();
     return r;
   }