mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-11 13:40:52 +00:00
Code Activity

fix crash in explanation generation. Codeplex issue 181

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-02-24 17:34:38 -08:00
parent 8ea7a1905f
commit 64e2011d42
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/muz/base/dl_rule.cpp
View file

@ -884,14 +884,15 @@ namespace datalog {
struct uninterpreted_function_finder_proc { struct uninterpreted_function_finder_proc {
ast_manager& m; ast_manager& m;
datatype_util m_dt; datatype_util m_dt;
dl_decl_util m_dl;
bool m_found; bool m_found;
func_decl* m_func; func_decl* m_func;
uninterpreted_function_finder_proc(ast_manager& m): uninterpreted_function_finder_proc(ast_manager& m):
m(m), m_dt(m), m_found(false), m_func(0) {} m(m), m_dt(m), m_dl(m), m_found(false), m_func(0) {}
void operator()(var * n) { } void operator()(var * n) { }
void operator()(quantifier * n) { } void operator()(quantifier * n) { }
void operator()(app * n) { void operator()(app * n) {
if (is_uninterp(n)) { if (is_uninterp(n) && !m_dl.is_rule_sort(n->get_decl()->get_range())) {
m_found = true; m_found = true;
m_func = n->get_decl(); m_func = n->get_decl();
} }

2
src/muz/rel/dl_mk_explanations.cpp
View file

@ -828,7 +828,7 @@ namespace datalog {
SASSERT(&expl_singleton->get_plugin()==m_er_plugin); SASSERT(&expl_singleton->get_plugin()==m_er_plugin);
m_e_fact_relation = static_cast<explanation_relation *>(expl_singleton); m_e_fact_relation = static_cast<explanation_relation *>(expl_singleton);
} }
func_decl_set const& predicates = m_context.get_predicates(); func_decl_set predicates(m_context.get_predicates());
decl_set::iterator it = predicates.begin(); decl_set::iterator it = predicates.begin();
decl_set::iterator end = predicates.end(); decl_set::iterator end = predicates.end();
for (; it!=end; ++it) { for (; it!=end; ++it) {

1
src/muz/rel/dl_relation_manager.cpp
View file

@ -734,6 +734,7 @@ namespace datalog {
relation_union_fn * relation_manager::mk_union_fn(const relation_base & tgt, const relation_base & src, relation_union_fn * relation_manager::mk_union_fn(const relation_base & tgt, const relation_base & src,
const relation_base * delta) { const relation_base * delta) {
TRACE("dl", tout << src.get_plugin().get_name() << " " << tgt.get_plugin().get_name() << "\n";);
relation_union_fn * res = tgt.get_plugin().mk_union_fn(tgt, src, delta); relation_union_fn * res = tgt.get_plugin().mk_union_fn(tgt, src, delta);
if(!res && &tgt.get_plugin()!=&src.get_plugin()) { if(!res && &tgt.get_plugin()!=&src.get_plugin()) {
res = src.get_plugin().mk_union_fn(tgt, src, delta); res = src.get_plugin().mk_union_fn(tgt, src, delta);

2
src/muz/rel/karr_relation.h
View file

@ -45,7 +45,7 @@ namespace datalog {
{} {}
virtual bool can_handle_signature(const relation_signature & sig) { virtual bool can_handle_signature(const relation_signature & sig) {
return true; return get_manager().get_context().karr();
} }
static symbol get_name() { return symbol("karr_relation"); } static symbol get_name() { return symbol("karr_relation"); }