Fix contract expansion for old#3491
Merged
Merged
Conversation
added 2 commits
September 4, 2024 11:32
celinval
approved these changes
Sep 4, 2024
celinval
left a comment
Contributor
There was a problem hiding this comment.
Thank you for fixing this!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the macro expansion for contracts to properly place history expressions.
Problem
Before this PR, instantiations of "remembers variables" (i.e., the variables that save the value before the function executes) were always put above any statements from previous macro expansions. For example, for this code (from #3359):
Kani would first expand the
requiresattribute and insertkani::assume(val < i32::MAX). The expansion ofensureswould then put the remembers variables first, generating this:which causes an integer overflow because we don't restrict the value of
valbefore adding 1. Instead, we want:Solution
The solution is to insert the remembers variables immediately after preconditions--that way, they respect the preconditions but are still declared before the function under contract executes. When we're expanding an
ensuresclause, we iterate through each of the already-generated statements, find the position where the preconditions end, then insert the remembers variables there. For instance:Resolves #3359
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.