From 644bd82ac73121f37bbac7ca72466527006232e3 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Wed, 21 Jul 2021 09:08:55 -0700
Subject: [PATCH] #5422

---
 src/ast/euf/euf_egraph.cpp   | 10 ++++++++++
 src/sat/smt/array_axioms.cpp |  2 +-
 src/sat/smt/array_model.cpp  | 11 ++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/ast/euf/euf_egraph.cpp b/src/ast/euf/euf_egraph.cpp
index 2bc9b1cde..0f82c2e6c 100644
--- a/src/ast/euf/euf_egraph.cpp
+++ b/src/ast/euf/euf_egraph.cpp
@@ -417,6 +417,16 @@ namespace euf {
             std::swap(r1, r2);
             std::swap(n1, n2);
         }
+        if (m.is_false(r2->get_expr()) && r1->value() == l_true) {
+            std::cout << "value assign conflict\n";
+            set_conflict(n1, n2, j);
+            return;
+        }
+        if (m.is_true(r2->get_expr()) && r1->value() == l_false) {
+            std::cout << "value assign conflict\n";
+            set_conflict(n1, n2, j);
+            return;
+        }
         if (j.is_congruence() && (m.is_false(r2->get_expr()) || m.is_true(r2->get_expr())))
             add_literal(n1, false);
         if (n1->is_equality() && n1->value() == l_false)
diff --git a/src/sat/smt/array_axioms.cpp b/src/sat/smt/array_axioms.cpp
index 89e079df4..2e8a0603d 100644
--- a/src/sat/smt/array_axioms.cpp
+++ b/src/sat/smt/array_axioms.cpp
@@ -540,7 +540,7 @@ namespace array {
             for (euf::enode* p : euf::enode_parents(n))
                 has_default |= a.is_default(p->get_expr());
             if (has_default)
-                propagate_parent_default(v);            
+                propagate_parent_default(v);      
         }
         bool change = false;
         unsigned sz = m_axiom_trail.size();
diff --git a/src/sat/smt/array_model.cpp b/src/sat/smt/array_model.cpp
index 964f6902d..b4e7d3cab 100644
--- a/src/sat/smt/array_model.cpp
+++ b/src/sat/smt/array_model.cpp
@@ -26,8 +26,8 @@ namespace array {
         if (!a.is_array(n->get_expr())) {
             dep.insert(n, nullptr);
             return true;
-        }
-        for (euf::enode* p : euf::enode_parents(n)) {
+        }       
+        for (euf::enode* p : euf::enode_parents(n->get_root())) {
             if (a.is_default(p->get_expr())) {
                 dep.add(n, p);
                 continue;
@@ -51,6 +51,7 @@ namespace array {
         SASSERT(a.is_array(n->get_expr()));
         ptr_vector<expr> args;
         sort* srt = n->get_sort();
+        n = n->get_root();
         unsigned arity = get_array_arity(srt);
         func_decl * f    = mk_aux_decl_for_array_sort(m, srt);
         func_interp * fi = alloc(func_interp, m, arity);
@@ -70,7 +71,7 @@ namespace array {
             expr* else_value = nullptr;
             unsigned max_occ_num = 0;
             obj_map<expr, unsigned> num_occ;
-            for (euf::enode* p : euf::enode_parents(n)) {
+            for (euf::enode* p : euf::enode_parents(n->get_root())) {
                 if (a.is_select(p->get_expr()) && p->get_arg(0)->get_root() == n->get_root()) {
                     expr* v = values.get(p->get_root_id());
                     if (!v)
@@ -90,7 +91,7 @@ namespace array {
         }
 
         for (euf::enode* p : euf::enode_parents(n)) {
-            if (a.is_select(p->get_expr()) && p->get_arg(0)->get_root() == n->get_root()) {
+            if (a.is_select(p->get_expr()) && p->get_arg(0)->get_root() == n) {
                 expr* value = values.get(p->get_root_id());
                 if (!value || value == fi->get_else())
                     continue;
@@ -102,7 +103,7 @@ namespace array {
         }
         
         parameter p(f);
-        values.set(n->get_root_id(), m.mk_app(get_id(), OP_AS_ARRAY, 1, &p));
+        values.set(n->get_expr_id(), m.mk_app(get_id(), OP_AS_ARRAY, 1, &p));
     }