mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

fixing regression of issue 1224 (#5723)

Browse source
This commit is contained in:
Margus Veanes 2021-12-19 14:07:53 -08:00 committed by GitHub
parent 4b813bac1c
commit 25d54ebb40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ast/rewriter/seq_rewriter.cpp
View file

@ -4956,6 +4956,7 @@ void seq_rewriter::elim_condition(expr* elem, expr_ref& cond) {
expr_ref_vector conds_range(m()); expr_ref_vector conds_range(m());
flatten_and(cond, conds); flatten_and(cond, conds);
expr* lhs = nullptr, *rhs = nullptr, *e1 = nullptr; expr* lhs = nullptr, *rhs = nullptr, *e1 = nullptr;
bool all_ranges = true;
if (u().is_char(elem)) { if (u().is_char(elem)) {
unsigned ch = 0, ch2 = 0; unsigned ch = 0, ch2 = 0;
svector<std::pair<unsigned, unsigned>> ranges, ranges1; svector<std::pair<unsigned, unsigned>> ranges, ranges1;
@ -4980,7 +4981,6 @@ void seq_rewriter::elim_condition(expr* elem, expr_ref& cond) {
ranges.append(ranges1); ranges.append(ranges1);
} }
}; };
bool all_ranges = true;
bool negated = false; bool negated = false;
for (expr* e : conds) { for (expr* e : conds) {
if (u().is_char_const_range(elem, e, ch, ch2, negated)) { if (u().is_char_const_range(elem, e, ch, ch2, negated)) {
@ -5030,7 +5030,6 @@ void seq_rewriter::elim_condition(expr* elem, expr_ref& cond) {
cond = m().mk_true(); cond = m().mk_true();
return; return;
} }
// removes all the trivially true conditions from conds
conds.set(conds_range); conds.set(conds_range);
} }
} }
@ -5054,6 +5053,13 @@ void seq_rewriter::elim_condition(expr* elem, expr_ref& cond) {
cond = m().mk_and(m().mk_eq(elem, solution), cond); cond = m().mk_and(m().mk_eq(elem, solution), cond);
} }
} }
else if (all_ranges) {
if (conds.empty())
// all ranges were removed as trivially true
cond = m().mk_true();
else
cond = m().mk_and(conds_range);
}
} }