mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 09:55:19 +00:00
Code Activity

fix #6513

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-12-30 09:55:10 -08:00
parent 47324af210
commit 07ab4d38b6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ast/simplifiers/extract_eqs.cpp
View file

@ -83,7 +83,7 @@ namespace euf {
class arith_extract_eq : public extract_eq { class arith_extract_eq : public extract_eq {
ast_manager& m; ast_manager& m;
arith_util a; arith_util a;
expr_ref_vector m_args; expr_ref_vector m_args, m_trail;
expr_sparse_mark m_nonzero; expr_sparse_mark m_nonzero;
bool m_enabled = true; bool m_enabled = true;
@ -216,20 +216,25 @@ namespace euf {
} }
} }
void mark_nonzero(expr* e) {
m_trail.push_back(e);
m_nonzero(e);
}
void add_pos(expr* f) { void add_pos(expr* f) {
expr* lhs = nullptr, * rhs = nullptr; expr* lhs = nullptr, *rhs = nullptr;
rational val; rational val;
if (a.is_le(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_neg()) if (a.is_le(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_neg())
m_nonzero.mark(lhs); mark_nonzero(lhs);
else if (a.is_ge(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_pos()) else if (a.is_ge(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_pos())
m_nonzero.mark(lhs); mark_nonzero(lhs);
else if (m.is_not(f, f)) { else if (m.is_not(f, f)) {
if (a.is_le(f, lhs, rhs) && a.is_numeral(rhs, val) && !val.is_neg()) if (a.is_le(f, lhs, rhs) && a.is_numeral(rhs, val) && !val.is_neg())
m_nonzero.mark(lhs); mark_nonzero(lhs);
else if (a.is_ge(f, lhs, rhs) && a.is_numeral(rhs, val) && !val.is_pos()) else if (a.is_ge(f, lhs, rhs) && a.is_numeral(rhs, val) && !val.is_pos())
m_nonzero.mark(lhs); mark_nonzero(lhs);
else if (m.is_eq(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_zero()) else if (m.is_eq(f, lhs, rhs) && a.is_numeral(rhs, val) && val.is_zero())
m_nonzero.mark(lhs); mark_nonzero(lhs);
} }
} }
@ -241,7 +246,7 @@ namespace euf {
public: public:
arith_extract_eq(ast_manager& m) : m(m), a(m), m_args(m) {} arith_extract_eq(ast_manager& m) : m(m), a(m), m_args(m), m_trail(m) {}
void get_eqs(dependent_expr const& e, dep_eq_vector& eqs) override { void get_eqs(dependent_expr const& e, dep_eq_vector& eqs) override {
if (!m_enabled) if (!m_enabled)