mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-10 01:05:47 +00:00
Code Activity

change handling of weak array mode. Insert weak delay variables into a queue that gets consumed by the next propagation when the array_weak parameter is changed #2686

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-11-19 21:17:36 -08:00
parent e45bafe9bf
commit 566eacd424
5 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/smt/theory_array_base.cpp
View file

@ -28,10 +28,16 @@ namespace smt {
theory_array_base::theory_array_base(ast_manager & m):
theory(m.mk_family_id("array")),
m_found_unsupported_op(false)
m_found_unsupported_op(false),
m_array_weak_head(0)
{
}
void theory_array_base::add_weak_var(theory_var v) {
get_context().push_trail(push_back_vector<context, svector<theory_var>>(m_array_weak_trail));
m_array_weak_trail.push_back(v);
}
void theory_array_base::found_unsupported_op(expr * n) {
if (!get_context().get_fparams().m_array_fake_support && !m_found_unsupported_op) {
TRACE("array", tout << mk_ll_pp(n, get_manager()) << "\n";);
@ -404,7 +410,12 @@ namespace smt {
}
bool theory_array_base::can_propagate() {
return !m_axiom1_todo.empty() || !m_axiom2_todo.empty() || !m_extensionality_todo.empty() || !m_congruent_todo.empty();
return
!m_axiom1_todo.empty() ||
!m_axiom2_todo.empty() ||
!m_extensionality_todo.empty() ||
!m_congruent_todo.empty() ||
(!get_context().get_fparams().m_array_weak && has_propagate_up_trail());
}
void theory_array_base::propagate() {
@ -421,6 +432,12 @@ namespace smt {
assert_congruent_core(m_congruent_todo[i].first, m_congruent_todo[i].second);
m_extensionality_todo.reset();
m_congruent_todo.reset();
if (!get_context().get_fparams().m_array_weak && has_propagate_up_trail()) {
get_context().push_trail(value_trail<context, unsigned>(m_array_weak_head));
for (; m_array_weak_head < m_array_weak_trail.size(); ++m_array_weak_head) {
set_prop_upward(m_array_weak_trail[m_array_weak_head]);
}
}
}
}