mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

fix #6340 - again

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-09-13 17:01:45 -07:00
parent c30b884247
commit fd5448d26b
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/smt/smt_context.cpp
View file

@ -3198,14 +3198,15 @@ namespace smt {
void context::internalize_assertions() {
if (get_cancel_flag()) return;
if (m_internalizing_assertions) return;
flet<bool> _internalizing(m_internalizing_assertions, true);
TRACE("internalize_assertions", tout << "internalize_assertions()...\n";);
timeit tt(get_verbosity_level() >= 100, "smt.preprocessing");
reduce_assertions();
if (get_cancel_flag()) return;
if (!m_asserted_formulas.inconsistent()) {
unsigned sz = m_asserted_formulas.get_num_formulas();
unsigned qhead = m_asserted_formulas.get_qhead();
while (qhead < sz) {
while (qhead < m_asserted_formulas.get_num_formulas()) {
if (get_cancel_flag()) {
m_asserted_formulas.commit(qhead);
return;

9
src/smt/smt_context.h
View file

@ -107,11 +107,12 @@ namespace smt {
ptr_vector<justification> m_justifications;
unsigned m_final_check_idx; // circular counter used for implementing fairness
unsigned m_final_check_idx = 0; // circular counter used for implementing fairness
bool m_is_auxiliary { false }; // used to prevent unwanted information from being logged.
class parallel* m_par { nullptr };
unsigned m_par_index { 0 };
bool m_is_auxiliary = false; // used to prevent unwanted information from being logged.
class parallel* m_par = nullptr;
unsigned m_par_index = 0;
bool m_internalizing_assertions = false;
// -----------------------------------
//

8
src/smt/smt_internalizer.cpp
View file

@ -615,11 +615,15 @@ namespace smt {
bool context::has_lambda() {
for (auto const & [n, q] : m_lambdas) {
if (n->get_class_size() != 1)
if (n->get_class_size() != 1) {
TRACE("context", tout << "class size " << n->get_class_size() << " " << enode_pp(n, *this) << "\n");
return true;
}
for (enode* p : enode::parents(n))
if (!is_beta_redex(p, n))
if (!is_beta_redex(p, n)) {
TRACE("context", tout << "not a beta redex " << enode_pp(p, *this) << "\n");
return true;
}
}
return false;
}

2
src/smt/theory_array_base.cpp
View file

@ -498,6 +498,8 @@ namespace smt {
return p->get_arg(0)->get_root() == n->get_root();
if (is_map(p))
return true;
if (is_store(p))
return true;
return false;
}