mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 20:05:51 +00:00
Code Activity

fix #3294

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-14 10:46:03 -07:00
parent b29c77dc87
commit 51e459d02b
55 changed files with 27 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tactic/core/blast_term_ite_tactic.cpp
View file

@ -128,7 +128,6 @@ class blast_term_ite_tactic : public tactic {
}
void operator()(goal_ref const & g, goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("blast-term-ite", *g);
bool produce_proofs = g->proofs_enabled();
@ -153,8 +152,6 @@ class blast_term_ite_tactic : public tactic {
report_tactic_progress(":blast-term-ite-consts", m_rw.m_cfg.m_num_fresh + num_fresh);
g->inc_depth();
result.push_back(g.get());
TRACE("blast_term_ite", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

3
src/tactic/core/cofactor_term_ite_tactic.cpp
View file

@ -55,15 +55,12 @@ public:
void collect_param_descrs(param_descrs & r) override { m_elim_ite.collect_param_descrs(r); }
void operator()(goal_ref const & g, goal_ref_buffer& result) override {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("cofactor-term-ite", g);
fail_if_unsat_core_generation("cofactor-term-ite", g);
tactic_report report("cofactor-term-ite", *g);
process(*(g.get()));
g->inc_depth();
result.push_back(g.get());
TRACE("cofactor-term-ite", g->display(tout););
SASSERT(g->is_well_sorted());
}
void cleanup() override { return m_elim_ite.cleanup(); }

2
src/tactic/core/ctx_simplify_tactic.cpp
View file

@ -569,7 +569,6 @@ struct ctx_simplify_tactic::imp {
}
void operator()(goal & g) {
SASSERT(g.is_well_sorted());
m_occs.reset();
m_occs(g);
m_num_steps = 0;
@ -588,7 +587,6 @@ struct ctx_simplify_tactic::imp {
process_goal(g);
}
IF_VERBOSE(TACTIC_VERBOSITY_LVL, verbose_stream() << "(ctx-simplify :num-steps " << m_num_steps << ")\n";);
SASSERT(g.is_well_sorted());
}
};

4
src/tactic/core/der_tactic.cpp
View file

@ -34,10 +34,8 @@ class der_tactic : public tactic {
}
void operator()(goal & g) {
SASSERT(g.is_well_sorted());
bool proofs_enabled = g.proofs_enabled();
tactic_report report("der", g);
TRACE("before_der", g.display(tout););
expr_ref new_curr(m());
proof_ref new_pr(m());
unsigned size = g.size();
@ -53,8 +51,6 @@ class der_tactic : public tactic {
g.update(idx, new_curr, new_pr, g.dep(idx));
}
g.elim_redundancies();
TRACE("after_der", g.display(tout););
SASSERT(g.is_well_sorted());
}
};

3
src/tactic/core/distribute_forall_tactic.cpp
View file

@ -103,7 +103,6 @@ public:
void operator()(goal_ref const & g,
goal_ref_buffer & result) override {
SASSERT(g->is_well_sorted());
ast_manager & m = g->m();
bool produce_proofs = g->proofs_enabled();
rw r(m, produce_proofs);
@ -128,8 +127,6 @@ public:
g->inc_depth();
result.push_back(g.get());
TRACE("distribute-forall", g->display(tout););
SASSERT(g->is_well_sorted());
m_rw = nullptr;
}

3
src/tactic/core/elim_term_ite_tactic.cpp
View file

@ -99,7 +99,6 @@ class elim_term_ite_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("elim-term-ite", *g);
bool produce_proofs = g->proofs_enabled();
m_rw.cfg().m_produce_models = g->models_enabled();
@ -122,8 +121,6 @@ class elim_term_ite_tactic : public tactic {
report_tactic_progress(":elim-term-ite-consts", m_rw.m_cfg.m_num_fresh);
g->inc_depth();
result.push_back(g.get());
TRACE("elim_term_ite", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

1
src/tactic/core/injectivity_tactic.cpp
View file

@ -145,7 +145,6 @@ class injectivity_tactic : public tactic {
void operator()(goal_ref const & goal,
goal_ref_buffer & result) {
SASSERT(goal->is_well_sorted());
tactic_report report("injectivity", *goal);
fail_if_unsat_core_generation("injectivity", goal); // TODO: Support UNSAT cores
fail_if_proof_generation("injectivity", goal);

3
src/tactic/core/nnf_tactic.cpp
View file

@ -55,7 +55,6 @@ public:
void operator()(goal_ref const & g, goal_ref_buffer & result) override {
TRACE("nnf", tout << "params: " << m_params << "\n"; g->display(tout););
SASSERT(g->is_well_sorted());
tactic_report report("nnf", *g);
bool produce_proofs = g->proofs_enabled();
@ -97,8 +96,6 @@ public:
for (unsigned i = 0; i < num_extra_names; i++)
fmc->hide(dnames.get_name_decl(i));
}
TRACE("nnf", g->display(tout););
SASSERT(g->is_well_sorted());
}
void cleanup() override {}

3
src/tactic/core/occf_tactic.cpp
View file

@ -127,7 +127,6 @@ class occf_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_proof_generation("occf", g);
bool produce_models = g->models_enabled();
@ -181,8 +180,6 @@ class occf_tactic : public tactic {
}
g->inc_depth();
result.push_back(g.get());
TRACE("occf", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

3
src/tactic/core/pb_preprocess_tactic.cpp
View file

@ -110,8 +110,7 @@ public:
void operator()(
goal_ref const & g,
goal_ref_buffer & result) override {
SASSERT(g->is_well_sorted());
tactic_report report("pb-preprocess", *g);
if (g->proofs_enabled()) {
throw tactic_exception("pb-preprocess does not support proofs");
}

3
src/tactic/core/propagate_values_tactic.cpp
View file

@ -123,7 +123,6 @@ class propagate_values_tactic : public tactic {
}
void run(goal_ref const & g, goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("propagate-values", *g);
m_goal = g.get();
@ -189,7 +188,7 @@ class propagate_values_tactic : public tactic {
m_goal->elim_redundancies();
m_goal->inc_depth();
result.push_back(m_goal);
SASSERT(m_goal->is_well_sorted());
SASSERT(m_goal->is_well_formed());
TRACE("propagate_values", tout << "end\n"; m_goal->display(tout););
TRACE("propagate_values_core", m_goal->display_with_dependencies(tout););
m_goal = nullptr;

2
src/tactic/core/reduce_args_tactic.cpp
View file

@ -482,7 +482,6 @@ reduce_args_tactic::~reduce_args_tactic() {
void reduce_args_tactic::operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
fail_if_unsat_core_generation("reduce-args", g);
result.reset();
if (!m_imp->m().proofs_enabled()) {
@ -490,7 +489,6 @@ void reduce_args_tactic::operator()(goal_ref const & g,
}
g->inc_depth();
result.push_back(g.get());
SASSERT(g->is_well_sorted());
}
void reduce_args_tactic::cleanup() {

2
src/tactic/core/simplify_tactic.cpp
View file

@ -43,7 +43,6 @@ struct simplify_tactic::imp {
}
void operator()(goal & g) {
SASSERT(g.is_well_sorted());
tactic_report report("simplifier", g);
TRACE("before_simplifier", g.display(tout););
m_num_steps = 0;
@ -68,7 +67,6 @@ struct simplify_tactic::imp {
g.elim_redundancies();
TRACE("after_simplifier", g.display(tout););
TRACE("after_simplifier_detail", g.display_with_dependencies(tout););
SASSERT(g.is_well_sorted());
}
unsigned get_num_steps() const { return m_num_steps; }

3
src/tactic/core/solve_eqs_tactic.cpp
View file

@ -1008,7 +1008,6 @@ class solve_eqs_tactic : public tactic {
}
void operator()(goal_ref const & g, goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
model_converter_ref mc;
tactic_report report("solve_eqs", *g);
TRACE("goal", g->display(tout););
@ -1047,8 +1046,6 @@ class solve_eqs_tactic : public tactic {
g->inc_depth();
g->add(mc.get());
result.push_back(g.get());
TRACE("goal", g->display(tout););
SASSERT(g->is_well_sorted());
}
};

1
src/tactic/core/split_clause_tactic.cpp
View file

@ -101,7 +101,6 @@ public:
void operator()(goal_ref const & in,
goal_ref_buffer & result) override {
SASSERT(in->is_well_sorted());
tactic_report report("split-clause", *in);
TRACE("before_split_clause", in->display(tout););
ast_manager & m = in->m();

3
src/tactic/core/tseitin_cnf_tactic.cpp
View file

@ -830,7 +830,6 @@ class tseitin_cnf_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result) {
SASSERT(g->is_well_sorted());
tactic_report report("tseitin-cnf", *g);
fail_if_proof_generation("tseitin-cnf", g);
m_produce_models = g->models_enabled();
@ -874,8 +873,6 @@ class tseitin_cnf_tactic : public tactic {
g->add(m_mc.get());
g->inc_depth();
result.push_back(g.get());
TRACE("tseitin_cnf", g->display(tout););
SASSERT(g->is_well_sorted());
}
};