diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-02-27 13:48:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 11:48:50 -0800 |
| commit | 0ad0496cd474a167973195d1ddc9322ada7f2b4e (patch) | |
| tree | b3c3c211382fbb6046229d3a0021a3a63ed921e2 | |
| parent | 0f75e689f02def2a726887bfd927f534ddc0305a (diff) | |
Fix large models for strings (#3835)
Fixes #3375.
Marking as "major" since in fact we produce incorrect models in production without the fix.
| -rw-r--r-- | src/theory/strings/theory_strings.cpp | 9 | ||||
| -rw-r--r-- | test/regress/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/regress/regress0/strings/large-model.smt2 | 7 |
3 files changed, 15 insertions, 2 deletions
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>() <= Rational(String::maxSize())) - << "Exceeded UINT32_MAX in string model"; + // must throw logic exception if we cannot construct the string + if (len_value.getConst<Rational>() > 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<Rational>().getNumerator().toUnsignedInt(); std::map<unsigned, Node>::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) |