mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

Minor fixes for QF_BV div0 ackermannization

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2016-02-01 18:04:19 +00:00
parent de28e57dee
commit 0b298b4df9
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tactic/ackr/ackermannize_tactic.cpp
View file

@ -35,6 +35,10 @@ public:
expr_dependency_ref & core) { expr_dependency_ref & core) {
mc = 0; mc = 0;
ast_manager& m(g->m()); ast_manager& m(g->m());
tactic_report report("ackermannize", *g);
fail_if_unsat_core_generation("ackermannize", g);
fail_if_proof_generation("ackermannize", g);
expr_ref_vector flas(m); expr_ref_vector flas(m);
const unsigned sz = g->size(); const unsigned sz = g->size();
for (unsigned i = 0; i < sz; i++) flas.push_back(g->form(i)); for (unsigned i = 0; i < sz; i++) flas.push_back(g->form(i));
@ -48,6 +52,10 @@ public:
if (g->models_enabled()) { if (g->models_enabled()) {
mc = mk_ackr_model_converter(m, imp->get_info()); mc = mk_ackr_model_converter(m, imp->get_info());
} }
resg->inc_depth();
TRACE("ackermannize", resg->display(tout););
SASSERT(resg->is_well_sorted());
} }
virtual void collect_statistics(statistics & st) const { virtual void collect_statistics(statistics & st) const {

15
src/tactic/probe.cpp
View file

@ -285,9 +285,16 @@ struct is_non_qfbv_predicate {
throw found(); throw found();
family_id fid = n->get_family_id(); family_id fid = n->get_family_id();
if (fid == m.get_basic_family_id()) if (fid == m.get_basic_family_id())
return; return;
if (fid == u.get_family_id()) if (fid == u.get_family_id()) {
return; if (n->get_decl_kind() == OP_BSDIV0 ||
n->get_decl_kind() == OP_BUDIV0 ||
n->get_decl_kind() == OP_BSREM0 ||
n->get_decl_kind() == OP_BUREM0 ||
n->get_decl_kind() == OP_BSMOD0)
throw found();
return;
}
if (is_uninterp_const(n)) if (is_uninterp_const(n))
return; return;
throw found(); throw found();
@ -305,8 +312,6 @@ public:
class is_qfbv_probe : public probe { class is_qfbv_probe : public probe {
public: public:
virtual result operator()(goal const & g) { virtual result operator()(goal const & g) {
bv_rewriter rw(g.m());
if (!rw.hi_div0()) return false;
return !test<is_non_qfbv_predicate>(g); return !test<is_non_qfbv_predicate>(g);
} }
}; };