From bfca26b9724e967afcbc70a9ef1f87de41023a36 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Mon, 2 Mar 2020 04:46:12 -0800 Subject: [PATCH] fix #3111 Signed-off-by: Nikolaj Bjorner --- src/solver/tactic2solver.cpp | 8 ++++---- src/tactic/ufbv/macro_finder_tactic.cpp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/solver/tactic2solver.cpp b/src/solver/tactic2solver.cpp index 70ee04ea2..426eae75b 100644 --- a/src/solver/tactic2solver.cpp +++ b/src/solver/tactic2solver.cpp @@ -173,9 +173,6 @@ lbool tactic2solver::check_sat_core2(unsigned num_assumptions, expr * const * as try { switch (::check_sat(*m_tactic, g, md, labels, pr, core, reason_unknown)) { case l_true: - if (m_mc) { - (*m_mc)(md); - } m_result->set_status(l_true); break; case l_false: @@ -191,7 +188,10 @@ lbool tactic2solver::check_sat_core2(unsigned num_assumptions, expr * const * as } break; } - m_mc = g->mc(); + m_mc = concat(g->mc(), m_mc.get()); + if (m_mc && md) { + (*m_mc)(md); + } TRACE("tactic", if (m_mc) m_mc->display(tout);); } catch (z3_error & ex) { diff --git a/src/tactic/ufbv/macro_finder_tactic.cpp b/src/tactic/ufbv/macro_finder_tactic.cpp index 6f72ecf5d..7b2cac6c2 100644 --- a/src/tactic/ufbv/macro_finder_tactic.cpp +++ b/src/tactic/ufbv/macro_finder_tactic.cpp @@ -41,6 +41,7 @@ class macro_finder_tactic : public tactic { goal_ref_buffer & result) { SASSERT(g->is_well_sorted()); tactic_report report("macro-finder", *g); + TRACE("macro-finder", g->display(tout);); bool produce_proofs = g->proofs_enabled(); bool unsat_core_enabled = g->unsat_core_enabled();