mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 04:43:39 +00:00
Code Activity

Bugfixes for bv_trailing.

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2016-04-07 13:08:17 +01:00
parent 3a532c08a6
commit 5971c20653
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ast/rewriter/bv_trailing.cpp
View file

@ -194,8 +194,7 @@ struct bv_trailing::imp {
return 0; return 0;
} }
if (!i) {// all args eaten completely if (!i && !new_last) {// all args eaten completely
SASSERT(new_last.get() == NULL);
SASSERT(retv == m_util.get_bv_size(a)); SASSERT(retv == m_util.get_bv_size(a));
result = NULL; result = NULL;
return retv; return retv;
@ -204,7 +203,7 @@ struct bv_trailing::imp {
expr_ref_vector new_args(m); expr_ref_vector new_args(m);
for (unsigned j = 0; j < i; ++j) for (unsigned j = 0; j < i; ++j)
new_args.push_back(a->get_arg(j)); new_args.push_back(a->get_arg(j));
if (new_last.get()) new_args.push_back(new_last); if (new_last) new_args.push_back(new_last);
result = new_args.size() == 1 ? new_args.get(0) result = new_args.size() == 1 ? new_args.get(0)
: m_util.mk_concat(new_args.size(), new_args.c_ptr()); : m_util.mk_concat(new_args.size(), new_args.c_ptr());
return retv; return retv;
@ -228,7 +227,7 @@ struct bv_trailing::imp {
unsigned retv = 0; unsigned retv = 0;
numeral e_val; numeral e_val;
if (m_util.is_numeral(e, e_val, sz)) { if (m_util.is_numeral(e, e_val, sz)) {
retv = remove_trailing(n, e_val); retv = remove_trailing(std::min(n, sz), e_val);
const unsigned new_sz = sz - retv; const unsigned new_sz = sz - retv;
result = new_sz ? (retv ? m_util.mk_numeral(e_val, new_sz) : e) : NULL; result = new_sz ? (retv ? m_util.mk_numeral(e_val, new_sz) : e) : NULL;
return retv; return retv;