mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 21:08:46 +00:00
Code Activity

fix #1766

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-07-29 02:22:28 -07:00
parent 5380b01fd1
commit 64e570f159
3 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/smt/theory_arith_core.h
View file

@ -2943,29 +2943,9 @@ namespace smt {
context & ctx = get_context(); context & ctx = get_context();
if (dump_lemmas()) { if (dump_lemmas()) {
TRACE("arith", ante.display(tout) << " --> "; ctx.display_detailed_literal(tout, l); tout << "\n";); TRACE("arith", ante.display(tout) << " --> "; ctx.display_detailed_literal(tout, l); tout << "\n";);
unsigned id = ctx.display_lemma_as_smt_problem(ante.lits().size(), ante.lits().c_ptr(), ctx.display_lemma_as_smt_problem(ante.lits().size(), ante.lits().c_ptr(),
ante.eqs().size(), ante.eqs().c_ptr(), l); ante.eqs().size(), ante.eqs().c_ptr(), l);
#if 1
if (id == 394) {
enable_trace("sign_row_conflict");
enable_trace("nl_arith_bug");
enable_trace("nl_evaluate");
enable_trace("propagate_bounds");
enable_trace("propagate_bounds_bug");
enable_trace("arith_conflict");
enable_trace("non_linear");
enable_trace("non_linear_bug");
}
SASSERT(id != 395);
if (id == 396) {
disable_trace("nl_arith_bug");
disable_trace("propagate_bounds");
disable_trace("arith_conflict");
disable_trace("non_linear");
disable_trace("non_linear_bug");
}
#endif
} }
} }
@ -2973,28 +2953,8 @@ namespace smt {
void theory_arith<Ext>::dump_lemmas(literal l, derived_bound const& ante) { void theory_arith<Ext>::dump_lemmas(literal l, derived_bound const& ante) {
context & ctx = get_context(); context & ctx = get_context();
if (dump_lemmas()) { if (dump_lemmas()) {
unsigned id = ctx.display_lemma_as_smt_problem(ante.lits().size(), ante.lits().c_ptr(), ctx.display_lemma_as_smt_problem(ante.lits().size(), ante.lits().c_ptr(),
ante.eqs().size(), ante.eqs().c_ptr(), l); ante.eqs().size(), ante.eqs().c_ptr(), l);
#if 1
if (id == 394) {
enable_trace("nl_arith_bug");
enable_trace("nl_evaluate");
enable_trace("propagate_bounds");
enable_trace("arith_conflict");
enable_trace("propagate_bounds_bug");
enable_trace("non_linear");
enable_trace("non_linear_bug");
}
SASSERT(id != 395);
if (id == 396) {
enable_trace("sign_row_conflict");
disable_trace("nl_arith_bug");
disable_trace("propagate_bounds");
disable_trace("arith_conflict");
disable_trace("non_linear");
disable_trace("non_linear_bug");
}
#endif
} }
} }

2
src/smt/theory_bv.cpp
View file

@ -161,6 +161,8 @@ namespace smt {
theory_var v = n->get_th_var(get_id()); theory_var v = n->get_th_var(get_id());
if (v == null_theory_var) { if (v == null_theory_var) {
v = mk_var(n); v = mk_var(n);
}
if (m_bits[v].empty()) {
mk_bits(v); mk_bits(v);
} }
return v; return v;

3
src/smt/theory_seq.cpp
View file

@ -5163,7 +5163,8 @@ void theory_seq::assign_eh(bool_var v, bool is_true) {
} }
else if (m_util.str.is_contains(e, e1, e2)) { else if (m_util.str.is_contains(e, e1, e2)) {
expr_ref_vector disj(m); expr_ref_vector disj(m);
if (m_seq_rewrite.reduce_contains(e1, e2, disj)) { // disabled pending regression on issue 1196
if (false && m_seq_rewrite.reduce_contains(e1, e2, disj)) {
literal_vector lits; literal_vector lits;
literal lit = mk_literal(e); literal lit = mk_literal(e);
lits.push_back(~lit); lits.push_back(~lit);