revert some fixes to euf

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Z3Prover · Nov 29, 2023 · 4289cfa · 4289cfa
1 parent 41a3196
commit 4289cfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ast/euf/euf_egraph.cpp b/src/ast/euf/euf_egraph.cpp
@@ -83,7 +83,7 @@ namespace euf {
     void egraph::reinsert_equality(enode* p) {
         SASSERT(p->is_equality());
         if (p->value() != l_true && p->get_arg(0)->get_root() == p->get_arg(1)->get_root()) 
-            queue_literal(p, nullptr);
+            add_literal(p, nullptr);
     }
 
     void egraph::queue_literal(enode* p, enode* ante) {
@@ -581,13 +581,13 @@ namespace euf {
 
 
     bool egraph::propagate() {
-        SASSERT(m_num_scopes == 0 || m_to_merge.empty());
         force_push();
         unsigned j = 0;
         for (unsigned i = 0; i < m_to_merge.size() && m.limit().inc() && !inconsistent(); ++i) {
             auto const& w = m_to_merge[i];
             switch (w.t) {
             case to_merge_plain:
+            case to_merge_comm:
                 merge(w.a, w.b, justification::congruence(w.commutativity(), m_congruence_timestamp++));
                 break;
             case to_add_literal:

diff --git a/src/ast/euf/euf_egraph.h b/src/ast/euf/euf_egraph.h
@@ -89,7 +89,7 @@ namespace euf {
             enode* a, * b;
             to_merge_t t;
             bool commutativity() const { return t == to_merge_comm; }
-            to_merge(enode* a, enode* b, bool c) : a(a), b(b), t(c ? to_merge_comm : to_merge_comm) {}
+            to_merge(enode* a, enode* b, bool c) : a(a), b(b), t(c ? to_merge_comm : to_merge_plain) {}
             to_merge(enode* p, enode* ante): a(p), b(ante), t(to_add_literal) {}
         };