mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-13 14:40:55 +00:00
Code Activity

fix #3557

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-03 16:37:59 -07:00
parent 0b856638e9
commit 426e4cc75c
65 changed files with 135 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/solver/parallel_tactic.cpp
View file

@ -321,7 +321,7 @@ class parallel_tactic : public tactic {
}
bool canceled() {
return m_giveup || m().canceled();
return m_giveup ||! m().inc();
}
std::ostream& display(std::ostream& out) {
@ -634,7 +634,7 @@ private:
cube_and_conquer(*st);
collect_statistics(*st);
m_queue.task_done(st);
if (st->m().canceled()) m_queue.shutdown();
if (!st->m().inc()) m_queue.shutdown();
IF_VERBOSE(1, display(verbose_stream()););
dealloc(st);
}
@ -748,7 +748,7 @@ public:
g->assert_expr(m.mk_false(), pr, lcore);
break;
case l_undef:
if (m.canceled()) {
if (!m.inc()) {
throw tactic_exception(Z3_CANCELED_MSG);
}
break;