[fix] Bring calls to SparseStorage constructor up to date

UnitTestBot · Nov 15, 2023 · c1648ab · c1648ab
1 parent 2b513ac
commit c1648ab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/Solver/CexCachingSolver.cpp b/lib/Solver/CexCachingSolver.cpp
@@ -382,10 +382,11 @@ bool CexCachingSolver::computeInitialValues(
   // FIXME: We should use smarter assignment for result so we don't
   // need redundant copy.
   values = std::vector<SparseStorage<unsigned char>>(objects.size());
+  Assignment::bindings_ty aBindings;
+  a->tryGetInitialValues(aBindings);
+
   for (unsigned i = 0; i < objects.size(); ++i) {
     const Array *os = objects[i];
-    Assignment::bindings_ty aBindings;
-    a->tryGetInitialValues(aBindings);
     Assignment::bindings_ty::iterator it = aBindings.find(os);
 
     if (it == aBindings.end()) {

diff --git a/lib/Solver/ConcretizingSolver.cpp b/lib/Solver/ConcretizingSolver.cpp
@@ -378,7 +378,7 @@ bool ConcretizingSolver::relaxSymcreteConstraints(const Query &query,
         sizeSymcrete->addressSymcrete.symcretized, newSize);
     unsigned char *charAddressIterator =
         reinterpret_cast<unsigned char *>(&address);
-    SparseStorage<unsigned char> storage(sizeof(address));
+    SparseStorage<unsigned char> storage(0);
     storage.store(0, charAddressIterator,
                   charAddressIterator + sizeof(address));
 

diff --git a/lib/Solver/IndependentSolver.cpp b/lib/Solver/IndependentSolver.cpp
@@ -225,7 +225,7 @@ bool IndependentSolver::computeInitialValues(
           dyn_cast<ConstantExpr>(retMap.evaluate(arr->size));
       assert(arrayConstantSize &&
              "Array of symbolic size had not receive value for size!");
-      SparseStorage<unsigned char> ret(arrayConstantSize->getZExtValue());
+      SparseStorage<unsigned char> ret(0);
       values.push_back(ret);
     } else {
       values.push_back(retMap.bindings.at(arr));

diff --git a/unittests/Assignment/AssignmentTest.cpp b/unittests/Assignment/AssignmentTest.cpp
@@ -19,7 +19,7 @@ TEST(AssignmentTest, FoldNotOptimized) {
       SourceBuilder::makeSymbolic("simple_array", 0));
   // Create a simple assignment
   std::vector<const Array *> objects;
-  SparseStorage<unsigned char> value(1);
+  SparseStorage<unsigned char> value(0);
   std::vector<SparseStorage<unsigned char>> values;
 
   objects.push_back(array);