mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-04 05:11:21 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2016-06-14 13:14:30 +01:00
commit c8c262fb93
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
contrib/cmake/src/tactic/core/CMakeLists.txt
View file

@ -3,6 +3,7 @@ z3_add_component(core_tactics
blast_term_ite_tactic.cpp blast_term_ite_tactic.cpp
cofactor_elim_term_ite.cpp cofactor_elim_term_ite.cpp
cofactor_term_ite_tactic.cpp cofactor_term_ite_tactic.cpp
collect_statistics_tactic.cpp
ctx_simplify_tactic.cpp ctx_simplify_tactic.cpp
der_tactic.cpp der_tactic.cpp
distribute_forall_tactic.cpp distribute_forall_tactic.cpp

7
src/muz/pdr/pdr_reachable_cache.cpp
View file

@ -109,7 +109,12 @@ namespace pdr {
UNREACHABLE(); UNREACHABLE();
break; break;
} }
if (found) m_stats.m_hits++; m_stats.m_miss++; if (found) {
m_stats.m_hits++;
}
else {
m_stats.m_miss++;
}
return found; return found;
} }

5
src/smt/theory_fpa.cpp
View file

@ -691,7 +691,10 @@ namespace smt {
m_rw.reset(); m_rw.reset();
m_th_rw.reset(); m_th_rw.reset();
m_trail_stack.pop_scope(m_trail_stack.get_num_scopes()); m_trail_stack.pop_scope(m_trail_stack.get_num_scopes());
if (m_factory) dealloc(m_factory); m_factory = 0; if (m_factory) {
dealloc(m_factory);
m_factory = 0;
}
ast_manager & m = get_manager(); ast_manager & m = get_manager();
dec_ref_map_key_values(m, m_conversions); dec_ref_map_key_values(m, m_conversions);
dec_ref_collection_values(m, m_is_added_to_model); dec_ref_collection_values(m, m_is_added_to_model);

16
src/tactic/probe.cpp
View file

@ -287,14 +287,14 @@ struct is_non_qfbv_predicate {
if (fid == m.get_basic_family_id()) if (fid == m.get_basic_family_id())
return; return;
if (fid == u.get_family_id()) { if (fid == u.get_family_id()) {
if (n->get_decl_kind() == OP_BSDIV0 || if (n->get_decl_kind() == OP_BSDIV0 ||
n->get_decl_kind() == OP_BUDIV0 || n->get_decl_kind() == OP_BUDIV0 ||
n->get_decl_kind() == OP_BSREM0 || n->get_decl_kind() == OP_BSREM0 ||
n->get_decl_kind() == OP_BUREM0 || n->get_decl_kind() == OP_BUREM0 ||
n->get_decl_kind() == OP_BSMOD0) n->get_decl_kind() == OP_BSMOD0)
throw found(); throw found();
return; return;
} }
if (is_uninterp_const(n)) if (is_uninterp_const(n))
return; return;
throw found(); throw found();