mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

fix #2624

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-10-10 19:20:02 -07:00
parent ecba7b3cde
commit ca7d066c4e
6 changed files with 66 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/params/smt_params.cpp
View file

@ -142,7 +142,6 @@ void smt_params::display(std::ostream & out) const {
DISPLAY_PARAM(m_profile_res_sub);
DISPLAY_PARAM(m_display_bool_var2expr);
DISPLAY_PARAM(m_display_ll_bool_var2expr);
DISPLAY_PARAM(m_abort_after_preproc);
DISPLAY_PARAM(m_model);
DISPLAY_PARAM(m_model_compact);
@ -151,7 +150,6 @@ void smt_params::display(std::ostream & out) const {
DISPLAY_PARAM(m_progress_sampling_freq);
DISPLAY_PARAM(m_display_installed_theories);
DISPLAY_PARAM(m_core_validate);
DISPLAY_PARAM(m_preprocess);

4
src/smt/params/smt_params.h
View file

@ -181,7 +181,6 @@ struct smt_params : public preprocessor_params,
bool m_profile_res_sub;
bool m_display_bool_var2expr;
bool m_display_ll_bool_var2expr;
bool m_abort_after_preproc;
// -----------------------------------
//
@ -205,7 +204,6 @@ struct smt_params : public preprocessor_params,
// Debugging goodies
//
// -----------------------------------
bool m_display_installed_theories;
bool m_core_validate;
// -----------------------------------
@ -292,13 +290,11 @@ struct smt_params : public preprocessor_params,
m_profile_res_sub(false),
m_display_bool_var2expr(false),
m_display_ll_bool_var2expr(false),
m_abort_after_preproc(false),
m_model(true),
m_model_compact(false),
m_model_on_timeout(false),
m_model_on_final_check(false),
m_progress_sampling_freq(0),
m_display_installed_theories(false),
m_core_validate(false),
m_preprocess(true), // temporary hack for disabling all preprocessing..
m_user_theory_preprocess_axioms(false),

39
src/smt/smt_context.cpp
View file

@ -1091,10 +1091,9 @@ namespace smt {
tout << mk_ll_pp(r2->get_owner(), m_manager) << "\n";
);
#ifdef Z3DEBUG
push_trail(push_back_trail<context, enode_pair, false>(m_diseq_vector));
m_diseq_vector.push_back(enode_pair(n1, n2));
#endif
DEBUG_CODE(
push_trail(push_back_trail<context, enode_pair, false>(m_diseq_vector));
m_diseq_vector.push_back(enode_pair(n1, n2)););
if (r1 == r2) {
TRACE("add_diseq_inconsistent", tout << "add_diseq #" << n1->get_owner_id() << " #" << n2->get_owner_id() << " inconsistency, scope_lvl: " << m_scope_lvl << "\n";);
@ -1299,7 +1298,7 @@ namespace smt {
enode * tmp = m_tmp_enode.set(f, num_args, args);
enode * r = m_cg_table.find(tmp);
#ifdef Z3DEBUG
if (r != 0) {
if (r != nullptr) {
SASSERT(r->get_owner()->get_decl() == f);
SASSERT(r->get_num_args() == num_args);
if (r->is_commutative()) {
@ -1592,9 +1591,7 @@ namespace smt {
}
}
TRACE("propagate_relevancy", tout << "marking as relevant:\n" << mk_bounded_pp(n, m_manager) << " " << m_scope_lvl << "\n";);
#ifndef SMTCOMP
m_case_split_queue->relevant_eh(n);
#endif
if (is_app(n)) {
if (e_internalized(n)) {
@ -1662,10 +1659,9 @@ namespace smt {
theory * th = get_theory(curr.m_th_id);
SASSERT(th);
th->new_eq_eh(curr.m_lhs, curr.m_rhs);
#ifdef Z3DEBUG
push_trail(push_back_trail<context, new_th_eq, false>(m_propagated_th_eqs));
m_propagated_th_eqs.push_back(curr);
#endif
DEBUG_CODE(
push_trail(push_back_trail<context, new_th_eq, false>(m_propagated_th_eqs));
m_propagated_th_eqs.push_back(curr););
}
m_th_eq_propagation_queue.reset();
}
@ -1676,10 +1672,9 @@ namespace smt {
theory * th = get_theory(curr.m_th_id);
SASSERT(th);
th->new_diseq_eh(curr.m_lhs, curr.m_rhs);
#ifdef Z3DEBUG
push_trail(push_back_trail<context, new_th_eq, false>(m_propagated_th_diseqs));
m_propagated_th_diseqs.push_back(curr);
#endif
DEBUG_CODE(
push_trail(push_back_trail<context, new_th_eq, false>(m_propagated_th_diseqs));
m_propagated_th_diseqs.push_back(curr););
}
m_th_diseq_propagation_queue.reset();
}
@ -3407,15 +3402,6 @@ namespace smt {
return;
m_setup(get_config_mode(use_static_features));
setup_components();
#ifndef _EXTERNAL_RELEASE
if (m_fparams.m_display_installed_theories) {
std::cout << "(theories";
for (theory* th : m_theory_set) {
std::cout << " " << th->get_name();
}
std::cout << ")" << std::endl;
}
#endif
}
void context::setup_components() {
@ -3542,11 +3528,6 @@ namespace smt {
lbool context::search() {
#ifndef _EXTERNAL_RELEASE
if (m_fparams.m_abort_after_preproc) {
exit(1);
}
#endif
if (m_asserted_formulas.inconsistent())
return l_false;
if (inconsistent()) {