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

fixing bugs uncovered by repro in #1914

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-11-05 13:54:23 -08:00
parent cf4bf7b591
commit f699ac0353
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/smt/theory_arith.h
View file

@ -541,9 +541,9 @@ namespace smt {
bool process_atoms() const; bool process_atoms() const;
unsigned get_num_conflicts() const { return m_num_conflicts; } unsigned get_num_conflicts() const { return m_num_conflicts; }
var_kind get_var_kind(theory_var v) const { return m_data[v].kind(); } var_kind get_var_kind(theory_var v) const { return m_data[v].kind(); }
bool is_base(theory_var v) const { return get_var_kind(v) == BASE; } bool is_base(theory_var v) const { return v != null_theory_var && get_var_kind(v) == BASE; }
bool is_quasi_base(theory_var v) const { return get_var_kind(v) == QUASI_BASE; } bool is_quasi_base(theory_var v) const { return v != null_theory_var && get_var_kind(v) == QUASI_BASE; }
bool is_non_base(theory_var v) const { return get_var_kind(v) == NON_BASE; } bool is_non_base(theory_var v) const { return v != null_theory_var && get_var_kind(v) == NON_BASE; }
void set_var_kind(theory_var v, var_kind k) { m_data[v].m_kind = k; } void set_var_kind(theory_var v, var_kind k) { m_data[v].m_kind = k; }
unsigned get_var_row(theory_var v) const { SASSERT(!is_non_base(v)); return m_data[v].m_row_id; } unsigned get_var_row(theory_var v) const { SASSERT(!is_non_base(v)); return m_data[v].m_row_id; }
void set_var_row(theory_var v, unsigned r_id) { m_data[v].m_row_id = r_id; } void set_var_row(theory_var v, unsigned r_id) { m_data[v].m_row_id = r_id; }

12
src/smt/theory_arith_aux.h
View file

@ -491,13 +491,21 @@ namespace smt {
if (!it->is_dead()) { if (!it->is_dead()) {
unsigned rid = it->m_row_id; unsigned rid = it->m_row_id;
row & r = m_rows[rid]; row & r = m_rows[rid];
if (is_base(r.get_base_var())) theory_var v = r.get_base_var();
if (v == null_theory_var) {
// skip
}
else if (is_base(v)) {
return it; return it;
}
else if (quasi_base_rid == -1) else if (quasi_base_rid == -1)
quasi_base_rid = rid; quasi_base_rid = rid;
} }
} }
SASSERT(quasi_base_rid != -1); // since c.size() != 0 if (quasi_base_rid == -1) {
return nullptr;
}
quasi_base_row2base_row(quasi_base_rid); quasi_base_row2base_row(quasi_base_rid);
// There is no guarantee that v is still a variable of row quasi_base_rid. // There is no guarantee that v is still a variable of row quasi_base_rid.