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

fix #4123

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-27 11:44:25 -07:00
parent 1c2aa1076b
commit 4938ea7be6
4 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ast/ast.cpp
View file

@ -1981,7 +1981,7 @@ void ast_manager::delete_node(ast * n) {
} }
if (m_debug_ref_count) { if (m_debug_ref_count) {
m_debug_free_indices.insert(n->m_id,0); m_debug_free_indices.insert(n->m_id,0);
} }
deallocate_node(n, ::get_node_size(n)); deallocate_node(n, ::get_node_size(n));
} }
} }

2
src/ast/ast.h
View file

@ -489,7 +489,7 @@ protected:
void dec_ref() { void dec_ref() {
SASSERT(m_ref_count > 0); SASSERT(m_ref_count > 0);
m_ref_count --; --m_ref_count;
} }
ast(ast_kind k):m_id(UINT_MAX), m_kind(k), m_mark1(false), m_mark2(false), m_mark_shared_occs(false), m_ref_count(0) { ast(ast_kind k):m_id(UINT_MAX), m_kind(k), m_mark1(false), m_mark2(false), m_mark_shared_occs(false), m_ref_count(0) {

1
src/smt/CMakeLists.txt
View file

@ -10,6 +10,7 @@ z3_add_component(smt
expr_context_simplifier.cpp expr_context_simplifier.cpp
fingerprints.cpp fingerprints.cpp
mam.cpp mam.cpp
model_sweeper.cpp
old_interval.cpp old_interval.cpp
qi_queue.cpp qi_queue.cpp
seq_axioms.cpp seq_axioms.cpp

41
src/tactic/arith/purify_arith_tactic.cpp
View file

@ -726,44 +726,27 @@ struct purify_arith_proc {
r(q->get_expr(), new_body, new_body_pr); r(q->get_expr(), new_body, new_body_pr);
unsigned num_vars = r.cfg().m_new_vars.size(); unsigned num_vars = r.cfg().m_new_vars.size();
expr_ref_vector & cnstrs = r.cfg().m_new_cnstrs; expr_ref_vector & cnstrs = r.cfg().m_new_cnstrs;
if (true || !cnstrs.empty()) { if (num_vars == 0 && !cnstrs.empty()) {
cnstrs.push_back(new_body); cnstrs.push_back(new_body);
new_body = m().mk_and(cnstrs.size(), cnstrs.c_ptr()); new_body = m().mk_and(cnstrs);
} }
TRACE("purify_arith", TRACE("purify_arith",
tout << "num_vars: " << num_vars << "\n"; tout << "num_vars: " << num_vars << "\n";
tout << "body: " << mk_ismt2_pp(q->get_expr(), m()) << "\nnew_body: " << mk_ismt2_pp(new_body, m()) << "\n";); tout << "body: " << mk_ismt2_pp(q->get_expr(), m()) << "\nnew_body: " << new_body << "\n";);
if (num_vars == 0) { if (num_vars == 0) {
result = m().update_quantifier(q, new_body); result = m().update_quantifier(q, new_body);
if (m_produce_proofs) {
auto& cnstr_prs = r.cfg().m_new_cnstr_prs;
result_pr = m().mk_rewrite_star(q->get_expr(), new_body, cnstr_prs.size(), cnstr_prs.c_ptr());
result_pr = m().mk_quant_intro(q, to_quantifier(result.get()), result_pr);
r.cfg().push_cnstr_pr(result_pr);
}
} }
else { else {
// Add new constraints result = q;
// Open space for new variables if (m_produce_proofs) {
var_shifter shifter(m()); r.cfg().push_cnstr_pr(nullptr);
shifter(new_body, num_vars, new_body);
// Rename fresh constants in r.cfg().m_new_vars to variables
ptr_buffer<sort> sorts;
buffer<symbol> names;
expr_substitution subst(m(), false, false);
for (unsigned i = 0; i < num_vars; i++) {
expr * c = r.cfg().m_new_vars.get(i);
sort * s = get_sort(c);
sorts.push_back(s);
names.push_back(m().mk_fresh_var_name("x"));
unsigned idx = num_vars - i - 1;
subst.insert(c, m().mk_var(idx, s));
} }
scoped_ptr<expr_replacer> replacer = mk_default_expr_replacer(m(), false);
replacer->set_substitution(&subst);
(*replacer)(new_body, new_body);
new_body = m().mk_exists(num_vars, sorts.c_ptr(), names.c_ptr(), new_body, q->get_weight());
result = m().update_quantifier(q, new_body);
}
if (m_produce_proofs) {
auto& cnstr_prs = r.cfg().m_new_cnstr_prs;
result_pr = m().mk_rewrite_star(q->get_expr(), new_body, cnstr_prs.size(), cnstr_prs.c_ptr());
result_pr = m().mk_quant_intro(q, to_quantifier(result.get()), result_pr);
r.cfg().push_cnstr_pr(result_pr);
} }
} }