mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-06 19:21:22 +00:00
Code Activity

fix #4481 (#4484)

Browse source
This commit is contained in:
trinhmt 2020-06-02 00:02:50 +08:00 • committed by GitHub
parent c967b4aead
commit 48a2d3d5b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/smt/seq_eq_solver.cpp
View file

@ -775,6 +775,10 @@ bool theory_seq::can_align_from_lhs(expr_ref_vector const& ls, expr_ref_vector c
for (unsigned i = 0; i < ls.size(); ++i) { for (unsigned i = 0; i < ls.size(); ++i) {
if (eq_unit(ls[i], rs.back())) { if (eq_unit(ls[i], rs.back())) {
bool same = true; bool same = true;
if (i == 0) {
m_overlap_lhs.insert(pair, true);
return true;
}
// ls = rs' ++ y && rs = x ++ rs', diff = |x| // ls = rs' ++ y && rs = x ++ rs', diff = |x|
if (rs.size() > i) { if (rs.size() > i) {
unsigned diff = rs.size() - (i + 1); unsigned diff = rs.size() - (i + 1);
@ -817,6 +821,10 @@ bool theory_seq::can_align_from_rhs(expr_ref_vector const& ls, expr_ref_vector c
unsigned diff = ls.size()-1-i; unsigned diff = ls.size()-1-i;
if (eq_unit(ls[diff], rs[0])) { if (eq_unit(ls[diff], rs[0])) {
bool same = true; bool same = true;
if (i == 0) {
m_overlap_rhs.insert(pair, true);
return true;
}
// ls = x ++ rs' && rs = rs' ++ y, diff = |x| // ls = x ++ rs' && rs = rs' ++ y, diff = |x|
if (rs.size() > i) { if (rs.size() > i) {
for (unsigned j = 1; same && j <= i; ++j) { for (unsigned j = 1; same && j <= i; ++j) {
@ -973,19 +981,21 @@ bool theory_seq::branch_quat_variable(eq const& e) {
bool cond = false; bool cond = false;
// xs and ys cannot align
if (!can_align_from_lhs(xs, ys) && !can_align_from_rhs(xs, ys))
cond = true;
// xs = ys and xs and ys cannot align except the case xs = ys // xs = ys and xs and ys cannot align except the case xs = ys
else if (xs == ys) { if (xs == ys) {
expr_ref_vector xs1(m), xs2(m); expr_ref_vector xs1(m), xs2(m);
xs1.reset(); xs1.reset();
xs1.append(xs.size()-1, xs.c_ptr()+1); xs1.append(xs.size()-1, xs.c_ptr()+1);
xs2.reset(); xs2.reset();
xs2.append(xs.size()-1, xs.c_ptr()); xs2.append(xs.size()-1, xs.c_ptr());
if (!can_align_from_lhs(xs2, ys) && !can_align_from_rhs(xs1, ys)) if (xs1.empty() || xs2.empty())
cond = true;
else if (!can_align_from_lhs(xs2, ys) && !can_align_from_rhs(xs1, ys))
cond = true; cond = true;
} }
// xs and ys cannot align
else if (!can_align_from_lhs(xs, ys) && !can_align_from_rhs(xs, ys))
cond = true;
if (cond) { if (cond) {
literal_vector lits; literal_vector lits;