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

avoid crash on box models under cancellation. Issue # SASSERT(!m_box_models.empty());

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-06-29 04:53:28 -07:00
parent 8aee7129f6
commit 0fdf01e410
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/opt/maxres.cpp
View file

@ -189,9 +189,10 @@ 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()) return l_undef; if (!init()) RUNDEF();
init_local(); init_local();
trace(); trace();
while (m_lower < m_upper) { while (m_lower < m_upper) {
@ -203,7 +204,7 @@ public:
); );
is_sat = check_sat_hill_climb(m_asms); is_sat = check_sat_hill_climb(m_asms);
if (m.canceled()) { if (m.canceled()) {
return l_undef; RUNDEF();
} }
switch (is_sat) { switch (is_sat) {
case l_true: case l_true:
@ -219,7 +220,7 @@ public:
} }
break; break;
case l_undef: case l_undef:
return l_undef; RUNDEF();
default: default:
break; break;
} }
@ -229,14 +230,14 @@ public:
} }
lbool primal_dual_solver() { lbool primal_dual_solver() {
if (!init()) return l_undef; if (!init()) RUNDEF();
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()) {
return l_undef; RUNDEF();
} }
switch (is_sat) { switch (is_sat) {
case l_true: case l_true:
@ -259,7 +260,7 @@ public:
} }
break; break;
case l_undef: case l_undef:
return l_undef; RUNDEF();
default: default:
break; break;
} }
@ -339,7 +340,7 @@ public:
case s_primal_dual: case s_primal_dual:
return primal_dual_solver(); return primal_dual_solver();
} }
return l_undef; RUNDEF();
} }
virtual void collect_statistics(statistics& st) const { virtual void collect_statistics(statistics& st) const {

18
src/opt/opt_context.cpp
View file

@ -366,12 +366,16 @@ namespace opt {
} }
lbool context::execute_box() { lbool context::execute_box() {
if (m_box_index < m_objectives.size()) { if (m_box_index < m_box_models.size()) {
SASSERT(m_box_index < m_box_models.size());
m_model = m_box_models[m_box_index]; m_model = m_box_models[m_box_index];
++m_box_index; ++m_box_index;
return l_true; return l_true;
} }
if (m_box_index < m_objectives.size()) {
m_model = 0;
++m_box_index;
return l_undef;
}
if (m_box_index != UINT_MAX && m_box_index >= m_objectives.size()) { if (m_box_index != UINT_MAX && m_box_index >= m_objectives.size()) {
m_box_index = UINT_MAX; m_box_index = UINT_MAX;
return l_false; return l_false;
@ -384,17 +388,14 @@ namespace opt {
if (obj.m_type == O_MAXSMT) { if (obj.m_type == O_MAXSMT) {
solver::scoped_push _sp(get_solver()); solver::scoped_push _sp(get_solver());
r = execute(obj, false, false); r = execute(obj, false, false);
if (r == l_true) { m_box_models.push_back(m_model.get());
m_box_models.push_back(m_model.get());
}
} }
else { else {
m_box_models.push_back(m_optsmt.get_model(j)); m_box_models.push_back(m_optsmt.get_model(j));
++j; ++j;
} }
} }
if (r == l_true && m_objectives.size() > 0) { if (r == l_true && m_box_models.size() > 0) {
SASSERT(!m_box_models.empty());
m_model = m_box_models[0]; m_model = m_box_models[0];
} }
return r; return r;
@ -498,6 +499,9 @@ namespace opt {
} }
std::string context::reason_unknown() const { std::string context::reason_unknown() const {
if (m.canceled()) {
return Z3_CANCELED_MSG;
}
if (m_solver.get()) { if (m_solver.get()) {
return m_solver->reason_unknown(); return m_solver->reason_unknown();
} }