mirror of
https://github.com/Z3Prover/z3
synced 2025-04-24 01:25:31 +00:00
replace restore_size_trail by more generic restore_vector
other updates: - change signature of advance_qhead to simplify call sites - have model reconstruction replay work on a tail of dependent_expr state, while adding formulas to the tail.
This commit is contained in:
parent
6454014119
commit
85f9c7eefa
25 changed files with 80 additions and 59 deletions
|
@ -2223,12 +2223,12 @@ namespace smt {
|
|||
continue;
|
||||
}
|
||||
TRACE("func_interp_bug", tout << "adding to assume_eq queue #" << n->get_owner_id() << " #" << n2->get_owner_id() << "\n";);
|
||||
m_assume_eq_candidates.push_back(std::make_pair(other, v));
|
||||
m_assume_eq_candidates.push_back({ other , v });
|
||||
result = true;
|
||||
}
|
||||
|
||||
if (result)
|
||||
ctx.push_trail(restore_size_trail<std::pair<theory_var, theory_var>, false>(m_assume_eq_candidates, old_sz));
|
||||
ctx.push_trail(restore_vector(m_assume_eq_candidates, old_sz));
|
||||
return delayed_assume_eqs();
|
||||
}
|
||||
|
||||
|
|
|
@ -1515,7 +1515,7 @@ public:
|
|||
}
|
||||
|
||||
if (num_candidates > 0) {
|
||||
ctx().push_trail(restore_size_trail<std::pair<theory_var, theory_var>, false>(m_assume_eq_candidates, old_sz));
|
||||
ctx().push_trail(restore_vector(m_assume_eq_candidates, old_sz));
|
||||
}
|
||||
|
||||
return delayed_assume_eqs();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue