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

#5211

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-04-22 22:42:05 -07:00
parent 5cfe273460
commit 5d49cb5519
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ast/euf/euf_egraph.cpp
View file

@ -765,7 +765,6 @@ namespace euf {
void egraph::copy_from(egraph const& src, std::function<void*(void*)>& copy_justification) { void egraph::copy_from(egraph const& src, std::function<void*(void*)>& copy_justification) {
SASSERT(m_scopes.empty()); SASSERT(m_scopes.empty());
SASSERT(src.m_scopes.empty());
SASSERT(m_nodes.empty()); SASSERT(m_nodes.empty());
ptr_vector<enode> old_expr2new_enode, args; ptr_vector<enode> old_expr2new_enode, args;
ast_translation tr(src.m, m); ast_translation tr(src.m, m);
@ -793,6 +792,8 @@ namespace euf {
merge(n2, n2t, n1->m_justification.copy(copy_justification)); merge(n2, n2t, n1->m_justification.copy(copy_justification));
} }
propagate(); propagate();
for (unsigned i = 0; i < src.m_scopes.size(); ++i)
push();
} }
} }

2
src/sat/sat_extension.h
View file

@ -68,7 +68,7 @@ namespace sat {
symbol m_name; symbol m_name;
solver* m_solver { nullptr }; solver* m_solver { nullptr };
public: public:
extension(symbol const& name, int id): m_id(id), m_name(name) {} extension(symbol const& name, int id): m_id(id), m_name(name) { }
virtual ~extension() {} virtual ~extension() {}
int get_id() const { return m_id; } int get_id() const { return m_id; }
void set_solver(solver* s) { m_solver = s; } void set_solver(solver* s) { m_solver = s; }

1
src/sat/smt/bv_solver.cpp
View file

@ -661,6 +661,7 @@ namespace bv {
result->m_bits[i].append(m_bits[i]); result->m_bits[i].append(m_bits[i]);
result->m_zero_one_bits[i].append(m_zero_one_bits[i]); result->m_zero_one_bits[i].append(m_zero_one_bits[i]);
} }
result->set_solver(&ctx.s());
for (theory_var i = 0; i < static_cast<theory_var>(get_num_vars()); ++i) for (theory_var i = 0; i < static_cast<theory_var>(get_num_vars()); ++i)
if (find(i) != i) if (find(i) != i)
result->m_find.merge(i, find(i)); result->m_find.merge(i, find(i));