mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-05 06:46:11 +00:00
Code Activity

Remove trivial membership constraints also after simplifications

Browse source
This commit is contained in:
CEisenhofer 2026-05-28 18:26:50 +02:00
parent 7d7199dec6
commit e5d5b493d3
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/smt/seq/seq_nielsen.cpp
View file

@ -1256,10 +1256,11 @@ namespace seq {
seq_util& seq = this->graph().seq(); seq_util& seq = this->graph().seq();
bool changed = true; bool changed = true;
if (id() == 4) { //if (id() == 9) {
graph().to_dot(std::cout); // std::string dot = graph().to_dot();
std::flush(std::cout); // std::cout << dot << std::endl;
} //}
// DON'T add rules here that add new constraints or apply substitutions // DON'T add rules here that add new constraints or apply substitutions
// add them to apply_det_modifier instead // add them to apply_det_modifier instead
@ -1761,6 +1762,17 @@ namespace seq {
} }
} }
// remove trivial membership constraints once again
unsigned wj = 0;
for (unsigned j = 0; j < m_str_mem.size(); ++j) {
str_mem& mem = m_str_mem[j];
if (mem.is_trivial(this))
continue;
m_str_mem[wj++] = mem;
}
if (wj < m_str_mem.size())
m_str_mem.shrink(wj);
// Regex widening: for each remaining str_mem, overapproximate // Regex widening: for each remaining str_mem, overapproximate
// the string by replacing variables with their regex intersection // the string by replacing variables with their regex intersection
// and check if the result intersected with the target regex is empty. // and check if the result intersected with the target regex is empty.
@ -1779,7 +1791,6 @@ namespace seq {
} }
} }
if (is_satisfied()) { if (is_satisfied()) {
// pass 1 removed all trivial str_eq entries; is_satisfied() requires // pass 1 removed all trivial str_eq entries; is_satisfied() requires
// the remainder to be trivial, so the vector must be empty here. // the remainder to be trivial, so the vector must be empty here.
@ -3031,6 +3042,9 @@ namespace seq {
str_mem const*& mem_out, str_mem const*& mem_out,
bool& fwd) { bool& fwd) {
for (str_mem const& mem : node->str_mems()) { for (str_mem const& mem : node->str_mems()) {
if (mem.is_trivial(node)) {
std::cout << "Trivial mem: " << mem_pp(mem, node->graph().get_manager()) << std::endl;
}
SASSERT(mem.well_formed() && !mem.is_trivial(node)); SASSERT(mem.well_formed() && !mem.is_trivial(node));
for (unsigned od = 0; od < 2; ++od) { for (unsigned od = 0; od < 2; ++od) {