mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

avoid crash on nl

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-12-15 06:38:56 -08:00
parent 1c3d385c25
commit 397cdfc608
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nlsat/nlsat_solver.cpp
View file

@ -732,7 +732,7 @@ namespace nlsat {
}
void undo_set_updt(interval_set * old_set) {
SASSERT(m_xk != null_var);
if (m_xk == null_var) return;
var x = m_xk;
if (x < m_infeasible.size()) {
m_ism.dec_ref(m_infeasible[x]);
@ -741,8 +741,7 @@ namespace nlsat {
}
void undo_new_stage() {
SASSERT(m_xk != null_var);
if (m_xk == 0) {
if (m_xk == 0 || m_xk == null_var) {
m_xk = null_var;
}
else {
@ -758,7 +757,6 @@ namespace nlsat {
}
void undo_updt_eq(atom * a) {
SASSERT(m_xk != null_var);
if (m_var2eq.size() > m_xk)
m_var2eq[m_xk] = a;
}

2
src/tactic/portfolio/default_tactic.cpp
View file

@ -41,8 +41,8 @@ tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
cond(mk_is_qflra_probe(), mk_qflra_tactic(m),
cond(mk_is_qfnra_probe(), mk_qfnra_tactic(m),
cond(mk_is_qfnia_probe(), mk_qfnia_tactic(m),
cond(mk_is_nra_probe(), mk_nra_tactic(m),
cond(mk_is_lira_probe(), mk_lira_tactic(m, p),
cond(mk_is_nra_probe(), mk_nra_tactic(m),
cond(mk_is_qffp_probe(), mk_qffp_tactic(m, p),
//cond(mk_is_qfufnra_probe(), mk_qfufnra_tactic(m, p),
mk_smt_tactic()))))))))))),

1
src/tactic/smtlogics/quant_tactics.cpp
View file

@ -24,7 +24,6 @@ Revision History:
#include "qe/qe_tactic.h"
#include "qe/qe_lite.h"
#include "qe/qsat.h"
#include "qe/nlqsat.h"
#include "tactic/core/ctx_simplify_tactic.h"
#include "smt/tactic/smt_tactic.h"
#include "tactic/core/elim_term_ite_tactic.h"