Skip to content

Do not unnecessarily sort guard conjuncts [blocks: #3486] #1998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2021
Merged

Do not unnecessarily sort guard conjuncts [blocks: #3486] #1998

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/analyses/guard_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ guard_exprt &operator-=(guard_exprt &g1, const guard_exprt &g2)
return g1;
}

sort_and_join(g1.expr);
exprt g2_sorted = g2.as_expr();
sort_and_join(g2_sorted);

exprt::operandst &op1 = g1.expr.operands();
const exprt::operandst &op2 = g2_sorted.operands();
Expand All @@ -112,10 +110,10 @@ guard_exprt &operator-=(guard_exprt &g1, const guard_exprt &g2)
for(exprt::operandst::const_iterator it2 = op2.begin(); it2 != op2.end();
++it2)
{
while(it1 != op1.end() && *it1 < *it2)
++it1;
if(it1 != op1.end() && *it1 == *it2)
it1 = op1.erase(it1);
else
break;
}

g1.expr = conjunction(op1);
Expand Down Expand Up @@ -159,9 +157,7 @@ guard_exprt &operator|=(guard_exprt &g1, const guard_exprt &g2)
}

// find common prefix
sort_and_join(g1.expr);
exprt g2_sorted = g2.as_expr();
sort_and_join(g2_sorted);

exprt::operandst &op1 = g1.expr.operands();
const exprt::operandst &op2 = g2_sorted.operands();
Expand Down