From: Andrew Reynolds Date: Thu, 27 Feb 2020 19:48:50 +0000 (-0600) Subject: Fix large models for strings (#3835) X-Git-Tag: cvc5-1.0.0~3584 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ad0496cd474a167973195d1ddc9322ada7f2b4e;p=cvc5.git Fix large models for strings (#3835) Fixes #3375. Marking as "major" since in fact we produce incorrect models in production without the fix. --- diff --git a/src/theory/strings/theory_strings.cpp b/src/theory/strings/theory_strings.cpp index c2790fe42..cd1d0cd67 100644 --- a/src/theory/strings/theory_strings.cpp +++ b/src/theory/strings/theory_strings.cpp @@ -304,8 +304,13 @@ bool TheoryStrings::collectModelInfo(TheoryModel* m) } else { - Assert(len_value.getConst() <= Rational(String::maxSize())) - << "Exceeded UINT32_MAX in string model"; + // must throw logic exception if we cannot construct the string + if (len_value.getConst() > Rational(String::maxSize())) + { + std::stringstream ss; + ss << "Cannot generate model with string whose length exceeds UINT32_MAX"; + throw LogicException(ss.str()); + } unsigned lvalue = len_value.getConst().getNumerator().toUnsignedInt(); std::map::iterator itvu = values_used.find(lvalue); diff --git a/test/regress/CMakeLists.txt b/test/regress/CMakeLists.txt index 7be085d48..332b703e8 100644 --- a/test/regress/CMakeLists.txt +++ b/test/regress/CMakeLists.txt @@ -913,6 +913,7 @@ set(regress_0_tests regress0/strings/issue3497.smt2 regress0/strings/issue3657-evalLeq.smt2 regress0/strings/itos-entail.smt2 + regress0/strings/large-model.smt2 regress0/strings/leadingzero001.smt2 regress0/strings/loop001.smt2 regress0/strings/model001.smt2 diff --git a/test/regress/regress0/strings/large-model.smt2 b/test/regress/regress0/strings/large-model.smt2 new file mode 100644 index 000000000..ca52e816b --- /dev/null +++ b/test/regress/regress0/strings/large-model.smt2 @@ -0,0 +1,7 @@ +; COMMAND-LINE: --lang=smt2.6.1 --check-models +; EXPECT: (error "Cannot generate model with string whose length exceeds UINT32_MAX") +; EXIT: 1 +(set-logic SLIA) +(declare-fun x () String) +(assert (> (str.len x) 100000000000000000000000000000000000000000000000000)) +(check-sat)