mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-01 18:38:47 +00:00
Code Activity

The demodulator doesn't produce proofs so remove code path that depends it does.

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-12-04 04:48:48 -08:00
parent 7fe6787748
commit d218083145
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ast/rewriter/demodulator_rewriter.cpp
View file

@ -616,15 +616,8 @@ void demodulator_rewriter::reschedule_demodulators(func_decl * f, expr * lhs) {
} }
} }
void demodulator_rewriter::operator()(unsigned n, expr * const * exprs, proof * const * prs, void demodulator_rewriter::operator()(unsigned n, expr * const * exprs,
expr_ref_vector & new_exprs, proof_ref_vector & new_prs) { expr_ref_vector & new_exprs) {
if (m.proofs_enabled()) {
TRACE("tactic", tout << "PRE_DEMODULATOR=true is not supported when proofs are enabled.";);
// Let us not waste time with proof production
new_exprs.append(n, exprs);
new_prs.append(n, prs);
return;
}
TRACE("demodulator", tout << "before demodulator:\n"; TRACE("demodulator", tout << "before demodulator:\n";
for ( unsigned i = 0 ; i < n ; i++ ) for ( unsigned i = 0 ; i < n ; i++ )

2
src/ast/rewriter/demodulator_rewriter.h
View file

@ -197,7 +197,7 @@ public:
demodulator_rewriter(ast_manager & m); demodulator_rewriter(ast_manager & m);
~demodulator_rewriter(); ~demodulator_rewriter();
void operator()(unsigned n, expr * const * exprs, proof * const * prs, expr_ref_vector & new_exprs, proof_ref_vector & new_prs); void operator()(unsigned n, expr * const * exprs, expr_ref_vector & new_exprs);
/** /**
Given a demodulator (aka rewrite rule) of the form Given a demodulator (aka rewrite rule) of the form

10
src/tactic/ufbv/ufbv_rewriter_tactic.cpp
View file

@ -41,14 +41,16 @@ public:
void collect_param_descrs(param_descrs & r) override { void collect_param_descrs(param_descrs & r) override {
insert_max_memory(r); insert_max_memory(r);
insert_produce_models(r); insert_produce_models(r);
insert_produce_proofs(r);
} }
void operator()(goal_ref const & g, goal_ref_buffer & result) override { void operator()(goal_ref const & g, goal_ref_buffer & result) override {
tactic_report report("ufbv-rewriter", *g); tactic_report report("ufbv-rewriter", *g);
fail_if_unsat_core_generation("ufbv-rewriter", g); fail_if_unsat_core_generation("ufbv-rewriter", g);
bool produce_proofs = g->proofs_enabled(); if (g->proofs_enabled()) {
result.push_back(g.get());
return;
}
demodulator_rewriter dem(m_manager); demodulator_rewriter dem(m_manager);
@ -61,11 +63,11 @@ public:
proofs.push_back(g->pr(i)); proofs.push_back(g->pr(i));
} }
dem(forms.size(), forms.data(), proofs.data(), new_forms, new_proofs); dem(forms.size(), forms.data(), new_forms);
g->reset(); g->reset();
for (unsigned i = 0; i < new_forms.size(); i++) for (unsigned i = 0; i < new_forms.size(); i++)
g->assert_expr(new_forms.get(i), produce_proofs ? new_proofs.get(i) : nullptr, nullptr); g->assert_expr(new_forms.get(i), nullptr, nullptr);
// CMW: Remark: The demodulator could potentially // CMW: Remark: The demodulator could potentially
// remove all references to a variable. // remove all references to a variable.