mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 01:24:08 +00:00
Code Activity

fix #2717

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-11-18 12:03:18 -08:00
parent d95b549ff8
commit 3c6dceae7c
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ast/rewriter/seq_rewriter.cpp
View file

@ -1704,8 +1704,7 @@ br_status seq_rewriter::mk_re_concat(expr* a, expr* b, expr_ref& result) {
} }
unsigned lo1, hi1, lo2, hi2; unsigned lo1, hi1, lo2, hi2;
if (m_util.re.is_loop(a, a1, lo1, hi1) && m_util.re.is_loop(b, b1, lo2, hi2) && a1 == b1) { if (m_util.re.is_loop(a, a1, lo1, hi1) && lo1 <= hi1 && m_util.re.is_loop(b, b1, lo2, hi2) && lo2 <= hi2 && a1 == b1) {
SASSERT(lo1 <= hi1 && lo2 <= hi2);
result = m_util.re.mk_loop(a1, lo1 + lo2, hi1 + hi2); result = m_util.re.mk_loop(a1, lo1 + lo2, hi1 + hi2);
return BR_DONE; return BR_DONE;
} }
@ -1715,8 +1714,7 @@ br_status seq_rewriter::mk_re_concat(expr* a, expr* b, expr_ref& result) {
} }
for (unsigned i = 0; i < 2; ++i) { for (unsigned i = 0; i < 2; ++i) {
// (loop a lo1) + (loop a lo2 hi2) = (loop a lo1 + lo2) // (loop a lo1) + (loop a lo2 hi2) = (loop a lo1 + lo2)
if (m_util.re.is_loop(a, a1, lo1) && m_util.re.is_loop(b, b1, lo2, hi2) && a1 == b1) { if (m_util.re.is_loop(a, a1, lo1) && m_util.re.is_loop(b, b1, lo2, hi2) && lo2 <= hi2 && a1 == b1) {
SASSERT(lo2 <= hi2);
result = m_util.re.mk_loop(a1, lo1 + lo2); result = m_util.re.mk_loop(a1, lo1 + lo2);
return BR_DONE; return BR_DONE;
} }
@ -1731,8 +1729,7 @@ br_status seq_rewriter::mk_re_concat(expr* a, expr* b, expr_ref& result) {
return BR_DONE; return BR_DONE;
} }
// (loop a lo1 hi1) + a = (loop a lo1+1 hi1+1) // (loop a lo1 hi1) + a = (loop a lo1+1 hi1+1)
if (m_util.re.is_loop(a, a1, lo1, hi1) && a1 == b) { if (m_util.re.is_loop(a, a1, lo1, hi1) && lo1 <= hi1 && a1 == b) {
SASSERT(lo1 <= hi1);
result = m_util.re.mk_loop(a1, lo1+1, hi1+1); result = m_util.re.mk_loop(a1, lo1+1, hi1+1);
return BR_DONE; return BR_DONE;
} }
@ -1848,7 +1845,7 @@ br_status seq_rewriter::mk_re_loop(func_decl* f, unsigned num_args, expr* const*
lo2 = np > 0 ? f->get_parameter(0).get_int() : 0; lo2 = np > 0 ? f->get_parameter(0).get_int() : 0;
hi2 = np > 1 ? f->get_parameter(1).get_int() : 0; hi2 = np > 1 ? f->get_parameter(1).get_int() : 0;
if (np == 2 && lo2 > hi2) { if (np == 2 && lo2 > hi2) {
result = m_util.re.mk_loop(args[0], hi2, hi2); result = m_util.re.mk_loop(args[0], lo2, lo2);
return BR_REWRITE1; return BR_REWRITE1;
} }
// (loop (loop a lo) lo2) = (loop lo*lo2) // (loop (loop a lo) lo2) = (loop lo*lo2)

1
src/model/model.cpp
View file

@ -215,6 +215,7 @@ struct model::top_sort : public ::top_sort<func_decl> {
}; };
void model::compress() { void model::compress() {
SASSERT(false);
if (m_cleaned) return; if (m_cleaned) return;
// stratify m_finterp and m_decls in a topological sort // stratify m_finterp and m_decls in a topological sort