3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-05-31 14:17:47 +00:00

use trail stack from context for ho-matcher

This commit is contained in:
Nikolaj Bjorner 2026-05-28 07:57:07 -07:00
parent 9d09a050e8
commit b34a7b4319

View file

@ -612,7 +612,6 @@ namespace smt {
scoped_ptr<model_finder> m_model_finder;
scoped_ptr<model_checker> m_model_checker;
scoped_ptr<euf::ho_matcher> m_ho_matcher;
trail_stack m_ho_trail;
unsigned m_new_enode_qhead;
unsigned m_lazy_matching_idx;
bool m_active;
@ -654,7 +653,7 @@ namespace smt {
m_model_checker->set_qm(qm);
if (m_fparams->m_ho_matching) {
m_ho_matcher = alloc(euf::ho_matcher, m, m_ho_trail);
m_ho_matcher = alloc(euf::ho_matcher, m, m_context->get_trail_stack());
std::function<void(euf::ho_subst&)> on_match = [&](euf::ho_subst& s) {
on_ho_match(s);
};
@ -777,13 +776,13 @@ namespace smt {
void push() override {
m_mam->push_scope();
m_lazy_mam->push_scope();
m_model_finder->push_scope();
m_model_finder->push_scope();
}
void pop(unsigned num_scopes) override {
m_mam->pop_scope(num_scopes);
m_lazy_mam->pop_scope(num_scopes);
m_model_finder->pop_scope(num_scopes);
m_model_finder->pop_scope(num_scopes);
}
void init_search_eh() override {