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

fix #3660

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-01 11:05:03 -07:00
parent c6b4641050
commit b3c863fb15
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ast/rewriter/rewriter_def.h
View file

@ -101,7 +101,7 @@ bool rewriter_tpl<Config>::process_const(app * t0) {
result_stack().push_back(m_r.get()); result_stack().push_back(m_r.get());
if (ProofGen) { if (ProofGen) {
SASSERT(rewrites_from(t0, m_pr)); SASSERT(rewrites_from(t0, m_pr));
SASSERT(rewrites_to(t0, m_pr)); SASSERT(rewrites_to(m_r, m_pr));
if (m_pr) if (m_pr)
result_pr_stack().push_back(m_pr); result_pr_stack().push_back(m_pr);
else else
@ -296,16 +296,14 @@ void rewriter_tpl<Config>::process_app(app * t, frame & fr) {
SASSERT(rewrites_to(new_t, m_pr)); SASSERT(rewrites_to(new_t, m_pr));
} }
} }
m_pr2 = nullptr;
br_status st = m_cfg.reduce_app(f, new_num_args, new_args, m_r, m_pr2); br_status st = m_cfg.reduce_app(f, new_num_args, new_args, m_r, m_pr2);
if (st != BR_FAILED && !rewrites_to(m_r, m_pr2)) enable_trace("reduce_app");
CTRACE("reduce_app", st != BR_FAILED, CTRACE("reduce_app", st != BR_FAILED,
tout << mk_bounded_pp(t, m()) << "\n"; tout << mk_bounded_pp(t, m()) << "\n";
tout << "st: " << st; tout << "st: " << st;
if (m_r) tout << " --->\n" << mk_bounded_pp(m_r, m()); if (m_r) tout << " --->\n" << mk_bounded_pp(m_r, m());
tout << "\n"; tout << "\n";
tout << m_pr2 << "\n"; if (m_pr2) tout << mk_bounded_pp(m_pr2, m()) << "\n";
); );
SASSERT(st == BR_FAILED || rewrites_to(m_r, m_pr2)); SASSERT(st == BR_FAILED || rewrites_to(m_r, m_pr2));
SASSERT(st != BR_DONE || m().get_sort(m_r) == m().get_sort(t)); SASSERT(st != BR_DONE || m().get_sort(m_r) == m().get_sort(t));

2
src/opt/opt_context.cpp
View file

@ -374,7 +374,7 @@ namespace opt {
void context::set_model(model_ref& m) { void context::set_model(model_ref& m) {
m_model = m; m_model = m;
opt_params optp(m_params); opt_params optp(m_params);
if (optp.dump_models()) { if (optp.dump_models() && m) {
model_ref md = m->copy(); model_ref md = m->copy();
fix_model(md); fix_model(md);
} }