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

fix model return after shutdown, reported in #4532

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-07-27 23:48:19 -07:00
parent b71a64365d
commit 8857a67e4f
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/smt/smt_context.cpp
View file

@ -4486,8 +4486,12 @@ namespace smt {
}
void context::get_model(model_ref & mdl) {
if (inconsistent() || !m.inc())
mdl = nullptr;
if (inconsistent())
mdl = nullptr;
else if (m_model.get())
mdl = m_model.get();
else if (!m.inc())
mdl = nullptr;
else {
mk_proto_model();
if (!m_model && m_proto_model) {

1
src/smt/smt_parallel.cpp
View file

@ -162,6 +162,7 @@ namespace smt {
pctx.assert_expr(mk_not(mk_and(pctx.unsat_core())));
return;
}
bool first = false;
{

3
src/solver/parallel_tactic.cpp
View file

@ -433,6 +433,9 @@ private:
}
m_models.push_back(mdl.get());
}
else if (m_models.empty()) {
m_has_undef = true;
}
if (!m_allsat) {
m_queue.shutdown();
}