mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 12:53:38 +00:00
Code Activity

Merge branch 'master' into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-05-03 08:53:52 -07:00 • committed by GitHub
commit f59bf4c464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/api/api_opt.cpp
View file

@ -140,6 +140,9 @@ extern "C" {
r = to_optimize_ptr(o)->optimize(); r = to_optimize_ptr(o)->optimize();
} }
catch (z3_exception& ex) { catch (z3_exception& ex) {
if (!mk_c(c)->m().canceled()) {
mk_c(c)->handle_exception(ex);
}
r = l_undef; r = l_undef;
if (ex.msg() == std::string("canceled") && mk_c(c)->m().canceled()) { if (ex.msg() == std::string("canceled") && mk_c(c)->m().canceled()) {
to_optimize_ptr(o)->set_reason_unknown(ex.msg()); to_optimize_ptr(o)->set_reason_unknown(ex.msg());

4
src/api/api_solver.cpp
View file

@ -392,7 +392,9 @@ extern "C" {
} }
catch (z3_exception & ex) { catch (z3_exception & ex) {
to_solver_ref(s)->set_reason_unknown(eh); to_solver_ref(s)->set_reason_unknown(eh);
mk_c(c)->handle_exception(ex); if (!mk_c(c)->m().canceled()) {
mk_c(c)->handle_exception(ex);
}
return Z3_L_UNDEF; return Z3_L_UNDEF;
} }
} }