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

disambiguating arguments to unordered map erase and dealing with unused and uninitialized variables

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-09 15:35:00 -07:00
parent d43c12413d
commit f4544eb060
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/smt/theory_lra.cpp
View file

@ -1246,7 +1246,6 @@ namespace smt {
if (!can_propagate()) { if (!can_propagate()) {
return; return;
} }
unsigned qhead = m_asserted_qhead;
while (m_asserted_qhead < m_asserted_atoms.size() && !ctx().inconsistent()) { while (m_asserted_qhead < m_asserted_atoms.size() && !ctx().inconsistent()) {
bool_var bv = m_asserted_atoms[m_asserted_qhead].m_bv; bool_var bv = m_asserted_atoms[m_asserted_qhead].m_bv;
bool is_true = m_asserted_atoms[m_asserted_qhead].m_is_true; bool is_true = m_asserted_atoms[m_asserted_qhead].m_is_true;
@ -1835,7 +1834,6 @@ namespace smt {
// bounds propagation. // bounds propagation.
// //
void propagate_bound_compound(bool_var bv, bool is_true, lp::bound& b) { void propagate_bound_compound(bool_var bv, bool is_true, lp::bound& b) {
lp::bound_kind k = b.get_bound_kind();
theory_var v = b.get_var(); theory_var v = b.get_var();
TRACE("arith", tout << mk_pp(get_owner(v), m) << "\n";); TRACE("arith", tout << mk_pp(get_owner(v), m) << "\n";);
if (static_cast<unsigned>(v) >= m_use_list.size()) { if (static_cast<unsigned>(v) >= m_use_list.size()) {

4
src/util/lp/lar_solver.h
View file

@ -1691,7 +1691,10 @@ public:
bool explanation_is_correct(const vector<std::pair<mpq, unsigned>>& explanation) const { bool explanation_is_correct(const vector<std::pair<mpq, unsigned>>& explanation) const {
#ifdef LEAN_DEBUG #ifdef LEAN_DEBUG
#if 0
// disabled as 'kind' is not assigned
lconstraint_kind kind; lconstraint_kind kind;
the_relations_are_of_same_type(explanation, kind);
lean_assert(the_left_sides_sum_to_zero(explanation)); lean_assert(the_left_sides_sum_to_zero(explanation));
mpq rs = sum_of_right_sides_of_explanation(explanation); mpq rs = sum_of_right_sides_of_explanation(explanation);
switch (kind) { switch (kind) {
@ -1709,6 +1712,7 @@ public:
lean_assert(false); lean_assert(false);
return false; return false;
} }
#endif
#endif #endif
return true; return true;
} }

2
src/util/lp/random_updater.hpp
View file

@ -184,7 +184,7 @@ void random_updater::remove_value(numeric_pair<mpq>& v) {
lean_assert(it != m_values.end()); lean_assert(it != m_values.end());
it->second--; it->second--;
if (it->second == 0) if (it->second == 0)
m_values.erase(it); m_values.erase((std::unordered_map<numeric_pair<mpq>, unsigned>::const_iterator)it);
} }
void random_updater::add_column_to_sets(unsigned j) { void random_updater::add_column_to_sets(unsigned j) {