Skip to content
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.

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

[Civl] Enhance quantifier elimination #829

Merged
merged 2 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Source/Concurrency/TransitionRelationComputation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,11 @@ private void TryElimination(IEnumerable<Variable> extraDefinedVariables)
varToExpr[assignment.Var] = SubstitutionHelper.Apply(varToExpr, assignment.Expr);
changed = true;
}
else if (Defined(assignment.Var) && assignment.Expr is IdentifierExpr ie && !Defined(ie.Decl))
{
varToExpr[ie.Decl] = SubstitutionHelper.Apply(varToExpr, Expr.Ident(assignment.Var));
changed = true;
}
else
{
remainingAssignments.Add(assignment);
Expand Down
14 changes: 14 additions & 0 deletions Test/civl/regression-tests/qelim1.bpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// RUN: %parallel-boogie "%s" > "%t"
// RUN: %diff "%s.expect" "%t"

atomic action {:layer 2} AtomicFoo() returns (o: int)
{
var y: int;
o := y;
}
yield procedure {:layer 1} Foo() returns (o: int)
refines AtomicFoo;
{
var x: int;
o := x;
}
2 changes: 2 additions & 0 deletions Test/civl/regression-tests/qelim1.bpl.expect
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

Boogie program verifier finished with 1 verified, 0 errors
Loading