mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 05:13:39 +00:00
Code Activity

avoid crash on box models under cancellation. Issue #654

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-06-29 04:54:31 -07:00
parent 0fdf01e410
commit 5d5004193b
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/opt/maxres.cpp
View file

@ -189,10 +189,9 @@ public:
trace_bounds(m_trace_id.c_str()); trace_bounds(m_trace_id.c_str());
} }
#define RUNDEF() { std::cout << __LINE__ << "\n"; return l_undef; }
lbool mus_solver() { lbool mus_solver() {
lbool is_sat = l_true; lbool is_sat = l_true;
if (!init()) RUNDEF(); if (!init()) return l_undef;
init_local(); init_local();
trace(); trace();
while (m_lower < m_upper) { while (m_lower < m_upper) {
@ -204,7 +203,7 @@ public:
); );
is_sat = check_sat_hill_climb(m_asms); is_sat = check_sat_hill_climb(m_asms);
if (m.canceled()) { if (m.canceled()) {
RUNDEF(); return l_undef;
} }
switch (is_sat) { switch (is_sat) {
case l_true: case l_true:
@ -220,7 +219,7 @@ public:
} }
break; break;
case l_undef: case l_undef:
RUNDEF(); return l_undef;
default: default:
break; break;
} }
@ -230,14 +229,14 @@ public:
} }
lbool primal_dual_solver() { lbool primal_dual_solver() {
if (!init()) RUNDEF(); if (!init()) return l_undef;
init_local(); init_local();
trace(); trace();
exprs cs; exprs cs;
while (m_lower < m_upper) { while (m_lower < m_upper) {
lbool is_sat = check_sat_hill_climb(m_asms); lbool is_sat = check_sat_hill_climb(m_asms);
if (m.canceled()) { if (m.canceled()) {
RUNDEF(); return l_undef;
} }
switch (is_sat) { switch (is_sat) {
case l_true: case l_true:
@ -260,7 +259,7 @@ public:
} }
break; break;
case l_undef: case l_undef:
RUNDEF(); return l_undef;
default: default:
break; break;
} }
@ -340,7 +339,7 @@ public:
case s_primal_dual: case s_primal_dual:
return primal_dual_solver(); return primal_dual_solver();
} }
RUNDEF(); return l_undef;
} }
virtual void collect_statistics(statistics& st) const { virtual void collect_statistics(statistics& st) const {