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

fix: Count proof obligations of loop headers #3244

Merged
merged 3 commits into from
Dec 22, 2022
Merged
Show file tree
Hide file tree
Changes from 2 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
10 changes: 9 additions & 1 deletion Source/DafnyCore/Verifier/BoogieStmtListBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Linq;
using Microsoft.Boogie;

namespace Microsoft.Dafny {
Expand Down Expand Up @@ -26,7 +27,14 @@ public void Add(Cmd cmd) {
}
}
}
public void Add(StructuredCmd scmd) { builder.Add(scmd); }

public void Add(StructuredCmd scmd) {
builder.Add(scmd);
if (scmd is Boogie.WhileCmd whyle && whyle.Invariants.Any(inv => inv is Boogie.AssertCmd)) {
tran.assertionCount++;
}
}

public void Add(TransferCmd tcmd) { builder.Add(tcmd); }
public void AddLabelCmd(string label) { builder.AddLabelCmd(label); }
public void AddLocalVariable(string name) { builder.AddLocalVariable(name); }
Expand Down
22 changes: 22 additions & 0 deletions Test/git-issues/git-issue-3243.dfy
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
// RUN: %diff "%s.expect" "%t"

method LoopWithBody(x: int)
decreases *
{
var i := 0;
while i < x
// The following loop-invariant-on-entry check was once omitted when it was the only proof obligation.
invariant i <= x // error: loop invariant does not hold on entry
decreases *
{
}
}

method BodylessLoop(x: int)
{
var i := 0;
while i < x
// The following loop-invariant-on-entry check was once omitted when it was the only proof obligation.
invariant i <= x // error: loop invariant does not hold on entry
}
7 changes: 7 additions & 0 deletions Test/git-issues/git-issue-3243.dfy.expect
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
git-issue-3243.dfy(19,2): Warning: note, this loop has no body (loop frame: i)
git-issue-3243.dfy(10,16): Error: This loop invariant might not hold on entry.
git-issue-3243.dfy(10,16): Related message: loop invariant violation
git-issue-3243.dfy(21,16): Error: This loop invariant might not hold on entry.
git-issue-3243.dfy(21,16): Related message: loop invariant violation

Dafny program verifier finished with 0 verified, 2 errors
1 change: 1 addition & 0 deletions docs/dev/news/3244.fix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check loop invariants on entry, even when such are the only proof obligations in a method.