Skip to content

Commit 998f102

Browse files
committed
[fix] Bring calls to SparseStorage constructor up to date
1 parent 4e0bab1 commit 998f102

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

lib/Solver/CexCachingSolver.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,11 @@ bool CexCachingSolver::computeInitialValues(
382382
// FIXME: We should use smarter assignment for result so we don't
383383
// need redundant copy.
384384
values = std::vector<SparseStorage<unsigned char>>(objects.size());
385+
Assignment::bindings_ty aBindings;
386+
a->tryGetInitialValues(aBindings);
387+
385388
for (unsigned i = 0; i < objects.size(); ++i) {
386389
const Array *os = objects[i];
387-
Assignment::bindings_ty aBindings;
388-
a->tryGetInitialValues(aBindings);
389390
Assignment::bindings_ty::iterator it = aBindings.find(os);
390391

391392
if (it == aBindings.end()) {

lib/Solver/ConcretizingSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ bool ConcretizingSolver::relaxSymcreteConstraints(const Query &query,
378378
sizeSymcrete->addressSymcrete.symcretized, newSize);
379379
unsigned char *charAddressIterator =
380380
reinterpret_cast<unsigned char *>(&address);
381-
SparseStorage<unsigned char> storage(sizeof(address));
381+
SparseStorage<unsigned char> storage(0);
382382
storage.store(0, charAddressIterator,
383383
charAddressIterator + sizeof(address));
384384

lib/Solver/IndependentSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ bool IndependentSolver::computeInitialValues(
225225
dyn_cast<ConstantExpr>(retMap.evaluate(arr->size));
226226
assert(arrayConstantSize &&
227227
"Array of symbolic size had not receive value for size!");
228-
SparseStorage<unsigned char> ret(arrayConstantSize->getZExtValue());
228+
SparseStorage<unsigned char> ret(0);
229229
values.push_back(ret);
230230
} else {
231231
values.push_back(retMap.bindings.at(arr));

unittests/Assignment/AssignmentTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TEST(AssignmentTest, FoldNotOptimized) {
1919
SourceBuilder::makeSymbolic("simple_array", 0));
2020
// Create a simple assignment
2121
std::vector<const Array *> objects;
22-
SparseStorage<unsigned char> value(1);
22+
SparseStorage<unsigned char> value(0);
2323
std::vector<SparseStorage<unsigned char>> values;
2424

2525
objects.push_back(array);

0 commit comments

Comments
 (0)