mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 03:15:50 +00:00
Code Activity

#5445

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-08-02 11:07:28 -07:00
parent 6c0a790576
commit d3194bb8a8
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/sat/tactic/goal2sat.cpp
View file

@ -216,8 +216,10 @@ struct goal2sat::imp : public sat::sat_internalizer {
if (!m_expr2var_replay || !m_expr2var_replay->find(t, v))
v = add_var(true, t);
m_map.insert(t, v);
if (relevancy_enabled() && (m.is_true(t) || m.is_false(t)))
if (relevancy_enabled() && (m.is_true(t) || m.is_false(t))) {
add_dual_root(sat::literal(v, m.is_false(t)));
ensure_euf()->track_relevancy(v);
}
return v;
}
@ -289,14 +291,14 @@ struct goal2sat::imp : public sat::sat_internalizer {
sat::bool_var v = m_map.to_bool_var(t);
if (v == sat::null_bool_var) {
if (m.is_true(t)) {
sat::literal tt = sat::literal(add_var(false, m.mk_true()), false);
sat::literal tt = sat::literal(mk_bool_var(t), false);
mk_root_clause(tt);
l = sign ? ~tt : tt;
}
else if (m.is_false(t)) {
sat::literal tt = sat::literal(add_var(false, m.mk_false()), true);
mk_root_clause(tt);
l = sign ? tt : ~tt;
sat::literal ff = sat::literal(mk_bool_var(t), false);
mk_root_clause(~ff);
l = sign ? ~ff : ff;
}
else if (m_euf) {
convert_euf(t, root, sign);
@ -796,7 +798,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
m_frame_stack.pop_back();
continue;
}
if (m.is_not(t) && !m.is_not(t->get_arg(0)) && fsz != sz + 1) {
if (m.is_not(t) && (root || (!m.is_not(t->get_arg(0)) && fsz != sz + 1))) {
m_frame_stack.pop_back();
visit(t->get_arg(0), root, !sign);
continue;