mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

remove stale assertions due to lambda #2446

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-07-30 14:32:06 +08:00
parent 902c683b92
commit 74631265b9
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/qe/qsat.cpp
View file

@ -1278,6 +1278,7 @@ namespace qe {
in->reset();
in->inc_depth();
result.push_back(in.get());
std::cout << in->models_enabled() << " " << m_model_save.get() << "\n";
if (in->models_enabled()) {
model_converter_ref mc;
mc = model2model_converter(m_model_save.get());

17
src/smt/smt_model_finder.cpp
View file

@ -522,7 +522,7 @@ namespace smt {
}
instantiation_set const * get_uvar_inst_set(quantifier * q, unsigned i) const {
SASSERT(!has_quantifiers(q->get_expr()));
//SASSERT(!has_quantifiers(q->get_expr()));
ast_idx_pair k(q, i);
node * r = nullptr;
if (m_uvars.find(k, r))
@ -1735,12 +1735,6 @@ namespace smt {
m_the_one(nullptr),
m_uvar_inst_sets(nullptr) {
if (has_quantifiers(q->get_expr()) && !m.is_lambda_def(q)) {
static bool displayed_flat_msg = false;
if (!displayed_flat_msg) {
// [Leo]: This warning message is not useful.
// warning_msg("For problems containing quantifiers, the model finding capabilities of Z3 work better when the formula does not contain nested quantifiers. You can use PULL_NESTED_QUANTIFIERS=true to eliminate nested quantifiers.");
displayed_flat_msg = true;
}
proof_ref pr(m);
expr_ref new_q(m);
pull_quant pull(m);
@ -1753,7 +1747,7 @@ namespace smt {
}
CTRACE("model_finder_bug", has_quantifiers(m_flat_q->get_expr()),
tout << mk_pp(q, m) << "\n" << mk_pp(m_flat_q, m) << "\n";);
SASSERT(m.is_lambda_def(q) || !has_quantifiers(m_flat_q->get_expr()));
// SASSERT(m.is_lambda_def(q) || !has_quantifiers(m_flat_q->get_expr()));
}
~quantifier_info() {
@ -2200,7 +2194,7 @@ namespace smt {
}
else {
SASSERT(is_quantifier(curr)); // no nested quantifiers
UNREACHABLE();
//UNREACHABLE();
}
}
}
@ -2332,7 +2326,8 @@ namespace smt {
}
else {
SASSERT(is_quantifier(curr));
UNREACHABLE(); // can't happen, the quantifier is supposed to be flat.
SASSERT(is_lambda(curr));
//UNREACHABLE(); // can't happen, the quantifier is supposed to be flat.
}
}
}
@ -2385,7 +2380,7 @@ namespace smt {
quantifier * q = d->get_flat_q();
if (m.is_lambda_def(q)) return;
expr * e = q->get_expr();
SASSERT(!has_quantifiers(e));
//SASSERT(!has_quantifiers(e));
reset_cache();
SASSERT(m_ttodo.empty());
SASSERT(m_ftodo.empty());