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

fix AV in debug assertion, address warnings

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-05-16 09:45:32 -07:00
parent 8b5eb08e2d
commit 2ca14b49fe
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmd_context/pdecl.cpp
View file

@ -189,7 +189,7 @@ class psort_app : public psort {
m.inc_ref(d); m.inc_ref(d);
m.inc_ref(num_args, args); m.inc_ref(num_args, args);
SASSERT(num_args == m_decl->get_num_params() || m_decl->has_var_params()); SASSERT(num_args == m_decl->get_num_params() || m_decl->has_var_params());
DEBUG_CODE(for (unsigned i = 0; i < num_params; i++) args[i]->check_num_params(this);); DEBUG_CODE(if (num_args == num_params) { for (unsigned i = 0; i < num_params; i++) args[i]->check_num_params(this); });
} }
virtual void finalize(pdecl_manager & m) { virtual void finalize(pdecl_manager & m) {

2
src/duality/duality.h
View file

@ -29,7 +29,7 @@ using namespace stl_ext;
namespace Duality { namespace Duality {
class implicant_solver; struct implicant_solver;
/* Generic operations on Z3 formulas */ /* Generic operations on Z3 formulas */

2
src/duality/duality_solver.cpp
View file

@ -2201,7 +2201,7 @@ namespace Duality {
#endif #endif
int expand_max = 1; int expand_max = 1;
if(0&&duality->BatchExpand){ if(0&&duality->BatchExpand){
int thing = stack.size() * 0.1; int thing = stack.size() / 10; // * 0.1;
expand_max = std::max(1,thing); expand_max = std::max(1,thing);
if(expand_max > 1) if(expand_max > 1)
std::cout << "foo!\n"; std::cout << "foo!\n";

18
src/muz/transforms/dl_mk_coi_filter.cpp
View file

@ -200,7 +200,23 @@ namespace datalog {
func_decl_set::iterator it = pruned_preds.begin(); func_decl_set::iterator it = pruned_preds.begin();
extension_model_converter* mc0 = alloc(extension_model_converter, m); extension_model_converter* mc0 = alloc(extension_model_converter, m);
for (; it != end; ++it) { for (; it != end; ++it) {
mc0->insert(*it, m.mk_true()); const rule_vector& rules = source.get_predicate_rules(*it);
expr_ref_vector fmls(m);
for (unsigned i = 0; i < rules.size(); ++i) {
app* head = rules[i]->get_head();
expr_ref_vector conj(m);
unsigned n = head->get_num_args()-1;
for (unsigned j = 0; j < head->get_num_args(); ++j) {
expr* arg = head->get_arg(j);
if (!is_var(arg)) {
conj.push_back(m.mk_eq(m.mk_var(j, m.get_sort(arg)), arg));
}
}
fmls.push_back(m.mk_and(conj.size(), conj.c_ptr()));
}
expr_ref fml(m);
fml = m.mk_or(fmls.size(), fmls.c_ptr());
mc0->insert(*it, fml);
} }
m_context.add_model_converter(mc0); m_context.add_model_converter(mc0);
} }