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, 3 insertions, 3 deletions

diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index 9cfcf627..88a3db4e 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -132,7 +132,7 @@ private:
 
   /// Map of globals to their bound address. This also includes
   /// globals that have no representative object (i.e. functions).
-  std::map<const llvm::GlobalValue*, ref<Expr> > globalAddresses;
+  std::map<const llvm::GlobalValue*, ref<ConstantExpr> > globalAddresses;
 
   /// The set of legal function addresses, used to validate function
   /// pointers. We use the actual Function* address as the function address.
@@ -307,7 +307,7 @@ private:
                     ExecutionState &state,
                     ref<Expr> value);
 
-  ref<Expr> evalConstantExpr(llvm::ConstantExpr *ce);
+  ref<klee::ConstantExpr> evalConstantExpr(llvm::ConstantExpr *ce);
 
   /// Return a unique constant value for the given expression in the
   /// given state, if it has one (i.e. it provably only has a single
@@ -385,7 +385,7 @@ public:
   }
 
   // XXX should just be moved out to utility module
-  ref<Expr> evalConstant(llvm::Constant *c);
+  ref<klee::ConstantExpr> evalConstant(llvm::Constant *c);
 
   virtual void setPathWriter(TreeStreamWriter *tsw) {
     pathWriter = tsw;