mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-02 21:36:09 +00:00
Code Activity

Change seq_plugin m_sg to sgraph& reference, enode_concat_hash takes sgraph& directly

Browse source 
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-03-03 00:07:53 +00:00
parent fbd3d445e2
commit 7c8f2d93bb
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ast/euf/euf_seq_plugin.cpp
View file

@ -47,12 +47,9 @@ namespace euf {
} }
unsigned enode_concat_hash::operator()(enode* n) const { unsigned enode_concat_hash::operator()(enode* n) const {
sgraph* sg = sg_ptr ? *sg_ptr : nullptr; snode* sn = sg.find(n->get_expr());
if (sg) { if (sn && sn->has_cached_hash())
snode* sn = sg->find(n->get_expr()); return sn->assoc_hash();
if (sn && sn->has_cached_hash())
return sn->assoc_hash();
}
if (!is_any_concat(n, seq)) if (!is_any_concat(n, seq))
return n->get_id(); return n->get_id();
enode_vector leaves; enode_vector leaves;
@ -82,18 +79,16 @@ namespace euf {
plugin(g), plugin(g),
m_seq(g.get_manager()), m_seq(g.get_manager()),
m_rewriter(g.get_manager()), m_rewriter(g.get_manager()),
m_sg(sg), m_sg(sg ? *sg : *alloc(sgraph, g.get_manager(), g, false)),
m_sg_owned(sg == nullptr), m_sg_owned(sg == nullptr),
m_concat_hash(m_seq, &m_sg), m_concat_hash(m_seq, m_sg),
m_concat_eq(m_seq), m_concat_eq(m_seq),
m_concat_table(DEFAULT_HASHTABLE_INITIAL_CAPACITY, m_concat_hash, m_concat_eq) { m_concat_table(DEFAULT_HASHTABLE_INITIAL_CAPACITY, m_concat_hash, m_concat_eq) {
if (!m_sg)
m_sg = alloc(sgraph, g.get_manager(), g, false);
} }
seq_plugin::~seq_plugin() { seq_plugin::~seq_plugin() {
if (m_sg_owned && m_sg) if (m_sg_owned)
dealloc(m_sg); dealloc(&m_sg);
} }
void seq_plugin::register_node(enode* n) { void seq_plugin::register_node(enode* n) {

10
src/ast/euf/euf_seq_plugin.h
View file

@ -50,14 +50,12 @@ namespace euf {
class sgraph; class sgraph;
// Associativity-respecting hash for enode concat trees. // Associativity-respecting hash for enode concat trees.
// Flattens concat(concat(a,b),c) and concat(a,concat(b,c)) // Uses cached snode hash matrices from the sgraph for O(1) hashing.
// to the same leaf sequence [a,b,c] before hashing.
// Handles both str.++ (OP_SEQ_CONCAT) and re.++ (OP_RE_CONCAT). // Handles both str.++ (OP_SEQ_CONCAT) and re.++ (OP_RE_CONCAT).
// When an sgraph is available, uses cached snode hash matrices.
struct enode_concat_hash { struct enode_concat_hash {
seq_util const& seq; seq_util const& seq;
sgraph* const* sg_ptr; // pointer to the sgraph* member in seq_plugin sgraph& sg;
enode_concat_hash(seq_util const& s, sgraph* const* sg = nullptr) : seq(s), sg_ptr(sg) {} enode_concat_hash(seq_util const& s, sgraph& sg) : seq(s), sg(sg) {}
unsigned operator()(enode* n) const; unsigned operator()(enode* n) const;
}; };
@ -78,7 +76,7 @@ namespace euf {
seq_util m_seq; seq_util m_seq;
seq_rewriter m_rewriter; seq_rewriter m_rewriter;
sgraph* m_sg = nullptr; // sgraph (may or may not be owned) sgraph& m_sg;
bool m_sg_owned = false; // whether we own the sgraph bool m_sg_owned = false; // whether we own the sgraph
svector<undo_kind> m_undo; svector<undo_kind> m_undo;