Switch Array* print-outs to use name instead of ID, and update a few

constructors I missed.


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

2 files changed, 7 insertions, 6 deletions

diff --git a/unittests/Expr/ExprTest.cpp b/unittests/Expr/ExprTest.cpp
index 7b37973a..f86af1aa 100644
--- a/unittests/Expr/ExprTest.cpp
+++ b/unittests/Expr/ExprTest.cpp
@@ -28,9 +28,9 @@ TEST(ExprTest, BasicConstruction) {
 }
 
 TEST(ExprTest, ConcatExtract) {
-  Array *array = new Array(0, 1, 256);
+  Array *array = new Array("arr0", 0, 1, 256);
   ref<Expr> read8 = Expr::createTempRead(array, 8);
-  Array *array2 = new Array(0, 2, 256);
+  Array *array2 = new Array("arr1", 0, 2, 256);
   ref<Expr> read8_2 = Expr::createTempRead(array2, 8);
   ref<Expr> c100 = getConstant(100, 8);
 
@@ -80,10 +80,10 @@ TEST(ExprTest, ConcatExtract) {
 }
 
 TEST(ExprTest, ExtractConcat) {
-  Array *array = new Array(0, 3, 256);
+  Array *array = new Array("arr0", 0, 3, 256);
   ref<Expr> read64 = Expr::createTempRead(array, 64);
 
-  Array *array2 = new Array(0, 4, 256);
+  Array *array2 = new Array("arr1", 0, 4, 256);
   ref<Expr> read8_2 = Expr::createTempRead(array2, 8);
   
   ref<Expr> extract1 = ExtractExpr::create(read64, 36, 4);
diff --git a/unittests/Solver/SolverTest.cpp b/unittests/Solver/SolverTest.cpp
index 1b1e0f3f..a6130716 100644
--- a/unittests/Solver/SolverTest.cpp
+++ b/unittests/Solver/SolverTest.cpp
@@ -12,6 +12,7 @@
 #include "klee/Constraints.h"
 #include "klee/Expr.h"
 #include "klee/Solver.h"
+#include "llvm/ADT/StringExtras.h"
 
 using namespace klee;
 
@@ -43,8 +44,8 @@ void testOperation(Solver &solver,
       return;
 
     unsigned size = Expr::getMinBytesForWidth(operandWidth);
-    static unsigned id = 0;
-    Array *array = new Array(0, ++id, size);
+    static uint64_t id = 0;
+    Array *array = new Array("arr" + llvm::utostr(id), 0, ++id, size);
     symbolicArgs.push_back(Expr::CreateArg(Expr::createTempRead(array, 
                                                                 operandWidth)));
   }