More ConstantExpr cleanup.

 - Change Executor::evalConstant to return ConstantExpr.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/Core/AddressSpace.cpp b/lib/Core/AddressSpace.cpp
index 1e683e34..25418c13 100644
--- a/lib/Core/AddressSpace.cpp
+++ b/lib/Core/AddressSpace.cpp
@@ -84,7 +84,7 @@ bool AddressSpace::resolveOne(ExecutionState &state,
     ref<ConstantExpr> cex;
     if (!solver->getValue(state, address, cex))
       return false;
-    unsigned example = (unsigned) cex->getConstantValue();
+    uint64_t example = cex->getZExtValue();
     MemoryObject hack(example);
     const MemoryMap::value_type *res = objects.lookup_previous(&hack);
     
@@ -191,7 +191,7 @@ bool AddressSpace::resolve(ExecutionState &state,
     ref<ConstantExpr> cex;
     if (!solver->getValue(state, p, cex))
       return true;
-    unsigned example = (unsigned) cex->getConstantValue();
+    uint64_t example = cex->getZExtValue();
     MemoryObject hack(example);
     
     MemoryMap::iterator oi = objects.upper_bound(&hack);