mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

more detailed tracing of where unmaterialized exceptions happen

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-11-19 18:15:42 -08:00
parent 7de0c29f12
commit 012fc1b72b
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/api/api_solver.cpp
View file

@ -628,6 +628,9 @@ extern "C" {
Z3_CATCH_RETURN(nullptr); Z3_CATCH_RETURN(nullptr);
} }
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
static Z3_lbool _solver_check(Z3_context c, Z3_solver s, unsigned num_assumptions, Z3_ast const assumptions[]) { static Z3_lbool _solver_check(Z3_context c, Z3_solver s, unsigned num_assumptions, Z3_ast const assumptions[]) {
for (unsigned i = 0; i < num_assumptions; i++) { for (unsigned i = 0; i < num_assumptions; i++) {
if (!is_expr(to_ast(assumptions[i]))) { if (!is_expr(to_ast(assumptions[i]))) {
@ -662,15 +665,15 @@ extern "C" {
} }
return Z3_L_UNDEF; return Z3_L_UNDEF;
} }
catch (...) { catch (std::exception& ex) {
to_solver_ref(s)->set_reason_unknown(eh); to_solver_ref(s)->set_reason_unknown(eh, ex);
to_solver(s)->set_eh(nullptr); to_solver(s)->set_eh(nullptr);
return Z3_L_UNDEF; return Z3_L_UNDEF;
} }
} }
to_solver(s)->set_eh(nullptr); to_solver(s)->set_eh(nullptr);
if (result == l_undef) { if (result == l_undef) {
to_solver_ref(s)->set_reason_unknown(eh); to_solver_ref(s)->set_reason_unknown(eh, __FILE__ ":" TOSTRING(__LINE__));
} }
return static_cast<Z3_lbool>(result); return static_cast<Z3_lbool>(result);
} }
@ -887,7 +890,7 @@ extern "C" {
} }
to_solver(s)->set_eh(nullptr); to_solver(s)->set_eh(nullptr);
if (result == l_undef) { if (result == l_undef) {
to_solver_ref(s)->set_reason_unknown(eh); to_solver_ref(s)->set_reason_unknown(eh, __FILE__ ":" TOSTRING(__LINE__));
} }
for (expr* e : _consequences) { for (expr* e : _consequences) {
to_ast_vector_ref(consequences).push_back(e); to_ast_vector_ref(consequences).push_back(e);

10
src/cmd_context/cmd_context.cpp
View file

@ -1782,19 +1782,15 @@ void cmd_context::check_sat(unsigned num_assumptions, expr * const * assumptions
try { try {
r = m_solver->check_sat(num_assumptions, assumptions); r = m_solver->check_sat(num_assumptions, assumptions);
if (r == l_undef && !m().inc()) { if (r == l_undef && !m().inc()) {
m_solver->set_reason_unknown(eh); m_solver->set_reason_unknown(eh, "canceled");
} }
} }
catch (z3_error & ex) { catch (z3_error & ex) {
m_solver->set_reason_unknown(eh, ex);
throw ex; throw ex;
} }
catch (z3_exception & ex) { catch (z3_exception & ex) {
if (!m().inc()) { m_solver->set_reason_unknown(eh, ex);
m_solver->set_reason_unknown(eh);
}
else {
m_solver->set_reason_unknown(ex.what());
}
r = l_undef; r = l_undef;
} }
m_solver->set_status(r); m_solver->set_status(r);

6
src/solver/check_sat_result.cpp
View file

@ -18,11 +18,11 @@ Notes:
--*/ --*/
#include "solver/check_sat_result.h" #include "solver/check_sat_result.h"
void check_sat_result::set_reason_unknown(event_handler& eh) { void check_sat_result::set_reason_unknown(event_handler& eh, char const* what) {
switch (eh.caller_id()) { switch (eh.caller_id()) {
case UNSET_EH_CALLER: case UNSET_EH_CALLER:
if (reason_unknown() == "") if (reason_unknown() == "")
set_reason_unknown("unclassified exception"); set_reason_unknown(what);
break; break;
case CTRL_C_EH_CALLER: case CTRL_C_EH_CALLER:
set_reason_unknown("interrupted from keyboard"); set_reason_unknown("interrupted from keyboard");
@ -46,7 +46,7 @@ void check_sat_result::set_reason_unknown(event_handler& eh, std::exception& ex)
set_reason_unknown(ex.what()); set_reason_unknown(ex.what());
break; break;
default: default:
set_reason_unknown(eh); set_reason_unknown(eh, ex.what());
break; break;
} }
} }

2
src/solver/check_sat_result.h
View file

@ -68,7 +68,7 @@ public:
virtual proof * get_proof_core() = 0; virtual proof * get_proof_core() = 0;
virtual std::string reason_unknown() const = 0; virtual std::string reason_unknown() const = 0;
virtual void set_reason_unknown(char const* msg) = 0; virtual void set_reason_unknown(char const* msg) = 0;
void set_reason_unknown(event_handler& eh); void set_reason_unknown(event_handler& eh, char const* msg);
void set_reason_unknown(event_handler& eh, std::exception& ex); void set_reason_unknown(event_handler& eh, std::exception& ex);
virtual void get_labels(svector<symbol> & r) = 0; virtual void get_labels(svector<symbol> & r) = 0;
virtual ast_manager& get_manager() const = 0; virtual ast_manager& get_manager() const = 0;