mirror of
https://github.com/Z3Prover/z3
synced 2025-06-22 05:43:39 +00:00
address some crashes reported by Caleb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
6524a70c32
commit
02f34ea4b1
3 changed files with 8 additions and 4 deletions
|
@ -525,7 +525,8 @@ namespace smt {
|
||||||
lits.reset();
|
lits.reset();
|
||||||
lits.push_back(~lit);
|
lits.push_back(~lit);
|
||||||
if (!m.is_true(cond)) {
|
if (!m.is_true(cond)) {
|
||||||
lits.push_back(th.mk_literal(mk_forall(m, hd, mk_not(m, cond))));
|
expr_ref ncond(mk_not(m, cond), m);
|
||||||
|
lits.push_back(th.mk_literal(mk_forall(m, hd, ncond)));
|
||||||
}
|
}
|
||||||
expr_ref is_empty1 = sk().mk_is_empty(p.second, re().mk_union(u, r));
|
expr_ref is_empty1 = sk().mk_is_empty(p.second, re().mk_union(u, r));
|
||||||
lits.push_back(th.mk_literal(is_empty1));
|
lits.push_back(th.mk_literal(is_empty1));
|
||||||
|
|
|
@ -128,7 +128,7 @@ namespace smt {
|
||||||
|
|
||||||
enode* theory::ensure_enode(expr* e) {
|
enode* theory::ensure_enode(expr* e) {
|
||||||
if (!ctx.e_internalized(e)) {
|
if (!ctx.e_internalized(e)) {
|
||||||
ctx.internalize(e, false);
|
ctx.internalize(e, is_quantifier(e));
|
||||||
}
|
}
|
||||||
enode* n = ctx.get_enode(e);
|
enode* n = ctx.get_enode(e);
|
||||||
ctx.mark_as_relevant(n);
|
ctx.mark_as_relevant(n);
|
||||||
|
|
|
@ -720,7 +720,7 @@ bool theory_seq::is_solved() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
// debug code
|
// debug code
|
||||||
for (enode* n : ctx.enodes()) {
|
for (enode* n : ctx.enodes()) {
|
||||||
expr* e = nullptr;
|
expr* e = nullptr;
|
||||||
rational len1, len2;
|
rational len1, len2;
|
||||||
|
@ -2881,8 +2881,11 @@ literal theory_seq::mk_simplified_literal(expr * _e) {
|
||||||
literal theory_seq::mk_literal(expr* _e) {
|
literal theory_seq::mk_literal(expr* _e) {
|
||||||
expr_ref e(_e, m);
|
expr_ref e(_e, m);
|
||||||
bool is_not = m.is_not(_e, _e);
|
bool is_not = m.is_not(_e, _e);
|
||||||
ensure_enode(_e);
|
if (!ctx.e_internalized(_e)) {
|
||||||
|
ctx.internalize(_e, is_quantifier(_e));
|
||||||
|
}
|
||||||
literal lit = ctx.get_literal(_e);
|
literal lit = ctx.get_literal(_e);
|
||||||
|
ctx.mark_as_relevant(lit);
|
||||||
if (is_not) lit.neg();
|
if (is_not) lit.neg();
|
||||||
return lit;
|
return lit;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue