mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

fix #5102

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-03-15 01:01:33 -07:00
parent 1cb0dbae51
commit 18143d8932
6 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/sat/smt/array_solver.h
View file

@ -110,14 +110,16 @@ namespace array {
struct hash {
solver& s;
hash(solver& s) :s(s) {}
unsigned hash_select(axiom_record const& r) const {
unsigned h = mk_mix(r.n->get_expr_id(), (unsigned)r.m_kind, r.select->get_arg(1)->get_expr_id());
for (unsigned i = 2; i < r.select->num_args(); ++i)
h = mk_mix(h, h, r.select->get_arg(i)->get_expr_id());
return h;
}
unsigned operator()(unsigned idx) const {
auto const& r = s.m_axiom_trail[idx];
if (r.m_kind == kind_t::is_select) {
unsigned h = mk_mix(r.n->get_expr_id(), (unsigned)r.m_kind, r.select->get_arg(1)->get_expr_id());
for (unsigned i = 2; i < r.select->num_args(); ++i)
h = mk_mix(h, 1, r.select->get_arg(i)->get_expr_id());
return h;
}
if (r.m_kind == kind_t::is_select)
return hash_select(r);
return mk_mix(r.n->get_expr_id(), (unsigned)r.m_kind, r.select ? r.select->get_expr_id() : 1);
}
};
@ -125,17 +127,20 @@ namespace array {
struct eq {
solver& s;
eq(solver& s) :s(s) {}
unsigned operator()(unsigned a, unsigned b) const {
auto const& p = s.m_axiom_trail[a];
auto const& r = s.m_axiom_trail[b];
bool eq_select(axiom_record const& p, axiom_record const& r) const {
if (p.m_kind != r.m_kind || p.n != r.n)
return false;
if (p.m_kind != kind_t::is_select)
return p.select == r.select;
for (unsigned i = p.select->num_args(); i-- > 1; )
if (p.select->get_arg(i) != r.select->get_arg(i))
return false;
return true;
return true;
}
unsigned operator()(unsigned a, unsigned b) const {
auto const& p = s.m_axiom_trail[a];
auto const& r = s.m_axiom_trail[b];
if (p.m_kind == kind_t::is_select)
return eq_select(p, r);
return p.m_kind == r.m_kind && p.n == r.n && p.select == r.select;
}
};
};

2
src/sat/smt/recfun_solver.cpp
View file

@ -312,6 +312,8 @@ namespace recfun {
}
if (found) {
++m_num_rounds;
if (!to_delete && !m_disabled_guards.empty())
to_delete = m_disabled_guards.back();
if (to_delete) {
m_disabled_guards.erase(to_delete);
m_enabled_guards.push_back(to_delete);