From: Andrew Reynolds <andrew.j.reynolds@gmail.com>
Date: Wed, 22 Apr 2020 18:32:20 +0000 (-0500)
Subject: Ensure disequality splits are processed as lemmas (#4380)
X-Git-Tag: cvc5-1.0.0~3343
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d64143f8aec229a673db1ec7b38d94890134d3f5;p=cvc5.git

Ensure disequality splits are processed as lemmas (#4380)

Fixes #4379. This was caused by a splitting lemma rewriting to a conjunction, being processed as a fact, and having a pending phase requirement sent out assuming the inference was to be processed as a lemma. This forces 2 of the splits in the core solver to be always processed as lemmas.
---

diff --git a/src/theory/strings/core_solver.cpp b/src/theory/strings/core_solver.cpp
index 21b406ff3..9989c89f4 100644
--- a/src/theory/strings/core_solver.cpp
+++ b/src/theory/strings/core_solver.cpp
@@ -1872,7 +1872,8 @@ void CoreSolver::processDeq(Node ni, Node nj)
               antec,
               nm->mkNode(
                   OR, nm->mkNode(AND, eq1, sk.eqNode(firstChar).negate()), eq2),
-              Inference::DEQ_DISL_FIRST_CHAR_STRING_SPLIT);
+              Inference::DEQ_DISL_FIRST_CHAR_STRING_SPLIT,
+              true);
           d_im.sendPhaseRequirement(eq1, true);
           return;
         }
@@ -1920,7 +1921,8 @@ void CoreSolver::processDeq(Node ni, Node nj)
         d_im.sendInference(antec,
                            antecNewLits,
                            nm->mkNode(AND, conc),
-                           Inference::DEQ_DISL_STRINGS_SPLIT);
+                           Inference::DEQ_DISL_STRINGS_SPLIT,
+                           true);
         return;
       }
     }
diff --git a/test/regress/CMakeLists.txt b/test/regress/CMakeLists.txt
index ac96110ce..cf953c252 100644
--- a/test/regress/CMakeLists.txt
+++ b/test/regress/CMakeLists.txt
@@ -1752,6 +1752,7 @@ set(regress_1_tests
   regress1/strings/issue3272.smt2
   regress1/strings/issue3357.smt2
   regress1/strings/issue3657-unexpectedUnsatCVC4.smt2
+  regress1/strings/issue4379.smt2
   regress1/strings/kaluza-fl.smt2
   regress1/strings/loop002.smt2
   regress1/strings/loop003.smt2
diff --git a/test/regress/regress1/strings/issue4379.smt2 b/test/regress/regress1/strings/issue4379.smt2
new file mode 100644
index 000000000..c5d024bc2
--- /dev/null
+++ b/test/regress/regress1/strings/issue4379.smt2
@@ -0,0 +1,9 @@
+; COMMAND-LINE: --strings-exp
+; EXPECT: sat
+(set-logic QF_SLIA)
+(set-info :status sat)
+(declare-const i7 Int)
+(declare-const Str8 String)
+(declare-const Str17 String)
+(assert (distinct (str.++ "" "rvhhcn" "" Str8 (int.to.str 56)) (str.++ "" (int.to.str i7) "" Str17) Str17))
+(check-sat)