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

move restore relevancy until after literals have been replayed

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-03-12 08:32:06 +01:00
parent 228111511c
commit 8bec1e25a8

View file

@ -3747,7 +3747,6 @@ namespace smt {
// of the new conflict clause. // of the new conflict clause.
if (relevancy()) record_relevancy(num_lits, lits); if (relevancy()) record_relevancy(num_lits, lits);
unsigned num_bool_vars = pop_scope_core(m_scope_lvl - new_lvl); unsigned num_bool_vars = pop_scope_core(m_scope_lvl - new_lvl);
if (relevancy()) restore_relevancy(num_lits, lits);
SASSERT(m_scope_lvl == new_lvl); SASSERT(m_scope_lvl == new_lvl);
// the logical context may still be in conflict after // the logical context may still be in conflict after
// clauses are reinitialized in pop_scope. // clauses are reinitialized in pop_scope.
@ -3778,6 +3777,7 @@ namespace smt {
} }
} }
} }
if (relevancy()) restore_relevancy(num_lits, lits);
// Resetting the cache manually because I did not invoke pop_scope, but pop_scope_core // Resetting the cache manually because I did not invoke pop_scope, but pop_scope_core
reset_cache_generation(); reset_cache_generation();
TRACE("resolve_conflict_bug", TRACE("resolve_conflict_bug",