Skip to content

Fix a bug related to hide/reveal and recursive functions #5764

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 4 commits into from
Sep 12, 2024
Merged

Fix a bug related to hide/reveal and recursive functions #5764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
854d7d6
Fix issues with hide *
keyboardDrummer Sep 11, 2024
102e499
Add comment
keyboardDrummer Sep 11, 2024
dea697d
Merge remote-tracking branch 'origin/master' into revealRecursive
keyboardDrummer Sep 12, 2024
bfeb05e
Fixes
keyboardDrummer Sep 12, 2024
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
2 changes: 1 addition & 1 deletion Source/DafnyCore/DafnyCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Include="Boogie.ExecutionEngine" Version="3.2.4" />
<PackageReference Include="Boogie.ExecutionEngine" Version="3.2.5" />
<PackageReference Include="Tomlyn" Version="0.16.2" />
</ItemGroup>

Expand Down
3 changes: 3 additions & 0 deletions Source/DafnyCore/Verifier/BoogieGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ public BoogieGenerator(ErrorReporter reporter, ProofDependencyManager depManager
Bpl.Program boogieProgram = ReadPrelude();
if (boogieProgram != null) {
sink = boogieProgram;
foreach (var function in boogieProgram.TopLevelDeclarations.OfType<Bpl.Function>()) {
function.AlwaysRevealed = true;
}
predef = FindPredefinedDecls(boogieProgram);
}
}
Expand Down
18 changes: 18 additions & 0 deletions Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,22 @@ method ReadsClause() {
reveal Obj;
}
}
}

module M1 {
ghost function RecFunc(x: nat): nat {
if x == 0 then 0
else 1 + RecFunc(x - 1)
}
}
module M2 {
import opened M1
lemma Lemma(x: nat)
ensures RecFunc(0) == 0
{
// Because RecFunc is recursive, it uses the fuel related $LS function,
// this was previously hidden by 'hide *', so that the ensures could not be proven
hide *;
reveal RecFunc;
}
}
2 changes: 1 addition & 1 deletion Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ revealFunctions.dfy(15,12): Error: assertion might not hold
revealFunctions.dfy(22,12): Error: assertion might not hold
revealFunctions.dfy(49,21): Error: assertion might not hold

Dafny program verifier finished with 15 verified, 3 errors
Dafny program verifier finished with 22 verified, 3 errors
2 changes: 1 addition & 1 deletion customBoogie.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ index 4a8b2f89b..a308be9bf 100644
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
- <PackageReference Include="Boogie.ExecutionEngine" Version="3.2.4" />
- <PackageReference Include="Boogie.ExecutionEngine" Version="3.2.5" />
+ <ProjectReference Include="..\..\boogie\Source\ExecutionEngine\ExecutionEngine.csproj" />
+ <ProjectReference Include="..\..\boogie\Source\BaseTypes\BaseTypes.csproj" />
+ <ProjectReference Include="..\..\boogie\Source\Core\Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"boogie": {
"version": "3.1.3",
"version": "3.2.5",
"commands": [
"boogie"
]
Expand Down