mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

fix out-of-scope value tester bug in theory_str::gen_free_var_options()

Browse source 
we now pass tests/z3str/charAt-003.smt2 with detailed debugging turned off!
This commit is contained in:
Murphy Berzish 2016-07-10 13:05:41 -04:00
parent 8aa6fee0af
commit 8d47b08244
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/smt/theory_str.cpp
View file

@ -5968,8 +5968,28 @@ expr * theory_str::gen_free_var_options(expr * freeVar, expr * len_indicator,
int len = atoi(len_valueStr.c_str());
if (fvar_valueTester_map[freeVar].find(len) == fvar_valueTester_map[freeVar].end()) {
TRACE("t_str_detail", tout << "no previous value testers" << std::endl;);
// check whether any value tester is actually in scope
// TODO NEXT we need to do this check for other tester variables that could potentially go out of scope
TRACE("t_str_detail", tout << "checking scope of previous value testers" << std::endl;);
bool map_effectively_empty = true;
if (fvar_valueTester_map[freeVar].find(len) != fvar_valueTester_map[freeVar].end()) {
// there's *something* in the map, but check its scope
svector<std::pair<int, expr*> > entries = fvar_valueTester_map[freeVar][len];
for (svector<std::pair<int,expr*> >::iterator it = entries.begin(); it != entries.end(); ++it) {
std::pair<int,expr*> entry = *it;
expr * aTester = entry.second;
if (internal_variable_set.find(aTester) == internal_variable_set.end()) {
TRACE("t_str_detail", tout << mk_pp(aTester, m) << " out of scope" << std::endl;);
} else {
TRACE("t_str_detail", tout << mk_pp(aTester, m) << " in scope" << std::endl;);
map_effectively_empty = false;
break;
}
}
}
if (map_effectively_empty) {
TRACE("t_str_detail", tout << "no previous value testers, or none of them were in scope" << std::endl;);
int tries = 0;
expr * val_indicator = mk_internal_valTest_var(freeVar, len, tries);
valueTester_fvar_map[val_indicator] = freeVar;