mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 22:23:22 +00:00
Code Activity

Fix compiler warnings

Browse source
This commit is contained in:
Arie Gurfinkel 2018-05-15 12:13:18 -07:00
parent 4b6921dffb
commit 7c727ee922
6 changed files with 79 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/muz/spacer/spacer_generalizers.cpp
View file

@ -158,6 +158,7 @@ void unsat_core_generalizer::operator()(lemma_ref &lemma)
unsigned old_sz = lemma->get_cube().size(); unsigned old_sz = lemma->get_cube().size();
unsigned old_level = lemma->level(); unsigned old_level = lemma->level();
(void)old_level;
unsigned uses_level; unsigned uses_level;
expr_ref_vector core(m); expr_ref_vector core(m);

2
src/muz/spacer/spacer_itp_solver.cpp
View file

@ -330,7 +330,7 @@ void itp_solver::get_itp_core (expr_ref_vector &core)
iuc_proof iuc_pr(m, res, B); iuc_proof iuc_pr(m, res, B);
// configure learner // configure learner
unsat_core_learner learner(m, iuc_pr, m_print_farkas_stats, m_iuc_debug_proof); unsat_core_learner learner(m, iuc_pr);
if (m_iuc_arith == 0 || m_iuc_arith > 3) if (m_iuc_arith == 0 || m_iuc_arith > 3)
{ {

4
src/muz/spacer/spacer_itp_solver.h
View file

@ -61,7 +61,6 @@ private:
unsigned m_iuc; unsigned m_iuc;
unsigned m_iuc_arith; unsigned m_iuc_arith;
bool m_print_farkas_stats; bool m_print_farkas_stats;
bool m_iuc_debug_proof;
bool m_old_hyp_reducer; bool m_old_hyp_reducer;
bool is_proxy(expr *e, app_ref &def); bool is_proxy(expr *e, app_ref &def);
void undo_proxies_in_core(ptr_vector<expr> &v); void undo_proxies_in_core(ptr_vector<expr> &v);
@ -69,7 +68,7 @@ private:
app* fresh_proxy(); app* fresh_proxy();
void elim_proxies(expr_ref_vector &v); void elim_proxies(expr_ref_vector &v);
public: public:
itp_solver(solver &solver, unsigned iuc, unsigned iuc_arith, bool print_farkas_stats, bool iuc_debug_proof, bool old_hyp_reducer, bool split_literals = false) : itp_solver(solver &solver, unsigned iuc, unsigned iuc_arith, bool print_farkas_stats, bool old_hyp_reducer, bool split_literals = false) :
m(solver.get_manager()), m(solver.get_manager()),
m_solver(solver), m_solver(solver),
m_proxies(m), m_proxies(m),
@ -83,7 +82,6 @@ public:
m_iuc(iuc), m_iuc(iuc),
m_iuc_arith(iuc_arith), m_iuc_arith(iuc_arith),
m_print_farkas_stats(print_farkas_stats), m_print_farkas_stats(print_farkas_stats),
m_iuc_debug_proof(iuc_debug_proof),
m_old_hyp_reducer(old_hyp_reducer) m_old_hyp_reducer(old_hyp_reducer)
{} {}

3
src/muz/spacer/spacer_proof_utils.cpp
View file

@ -388,8 +388,7 @@ proof* ProofIteratorPostOrder::next()
} }
proof* res; proof* res;
bool found = m_cache.find(pr,res); VERIFY(m_cache.find(pr,res));
SASSERT(found);
DEBUG_CODE(proof_checker pc(m); DEBUG_CODE(proof_checker pc(m);
expr_ref_vector side(m); expr_ref_vector side(m);
SASSERT(pc.check(res, side)); SASSERT(pc.check(res, side));

10
src/muz/spacer/spacer_prop_solver.cpp
View file

@ -60,8 +60,14 @@ prop_solver::prop_solver(manager& pm, fixedpoint_params const& p, symbol const&
m_solvers[1] = pm.mk_fresh2(); m_solvers[1] = pm.mk_fresh2();
m_fparams[1] = &pm.fparams2(); m_fparams[1] = &pm.fparams2();
m_contexts[0] = alloc(spacer::itp_solver, *(m_solvers[0]), p.spacer_iuc(), p.spacer_iuc_arith(), p.spacer_print_farkas_stats(), p.spacer_iuc_debug_proof(), p.spacer_old_hyp_reducer(), p.spacer_split_farkas_literals()); m_contexts[0] = alloc(spacer::itp_solver, *(m_solvers[0]), p.spacer_iuc(),
m_contexts[1] = alloc(spacer::itp_solver, *(m_solvers[1]), p.spacer_iuc(), p.spacer_iuc_arith(), p.spacer_print_farkas_stats(), p.spacer_iuc_debug_proof(), p.spacer_old_hyp_reducer(), p.spacer_split_farkas_literals()); p.spacer_iuc_arith(),
p.spacer_old_hyp_reducer(),
p.spacer_split_farkas_literals());
m_contexts[1] = alloc(spacer::itp_solver, *(m_solvers[1]), p.spacer_iuc(),
p.spacer_iuc_arith(),
p.spacer_old_hyp_reducer(),
p.spacer_split_farkas_literals());
for (unsigned i = 0; i < 2; ++i) for (unsigned i = 0; i < 2; ++i)
{ m_contexts[i]->assert_expr(m_pm.get_background()); } { m_contexts[i]->assert_expr(m_pm.get_background()); }

9
src/muz/spacer/spacer_unsat_core_learner.h
View file

@ -32,7 +32,8 @@ namespace spacer {
typedef obj_hashtable<expr> expr_set; typedef obj_hashtable<expr> expr_set;
public: public:
unsat_core_learner(ast_manager& m, iuc_proof& pr, bool print_farkas_stats = false, bool iuc_debug_proof = false) : m(m), m_pr(pr), m_unsat_core(m), m_print_farkas_stats(print_farkas_stats), m_iuc_debug_proof(iuc_debug_proof) {}; unsat_core_learner(ast_manager& m, iuc_proof& pr) :
m(m), m_pr(pr), m_unsat_core(m) {};
virtual ~unsat_core_learner(); virtual ~unsat_core_learner();
ast_manager& m; ast_manager& m;
@ -72,7 +73,9 @@ namespace spacer {
ptr_vector<unsat_core_plugin> m_plugins; ptr_vector<unsat_core_plugin> m_plugins;
ast_mark m_closed; ast_mark m_closed;
expr_ref_vector m_unsat_core; // collects the lemmas of the unsat-core, will at the end be inserted into unsat_core. // collects the lemmas of the unsat-core
// will at the end be inserted into unsat_core.
expr_ref_vector m_unsat_core;
/* /*
* computes partial core for step by delegating computation to plugins * computes partial core for step by delegating computation to plugins
@ -84,8 +87,6 @@ namespace spacer {
*/ */
void finalize(); void finalize();
bool m_print_farkas_stats;
bool m_iuc_debug_proof;
}; };
} }