CONTRACTS: Front-end: frees clause improvements #7087
Closed
Conversation
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
remi-delmas-3000
requested review from
SaswatPadhi,
chris-ryder,
feliperodri,
kroening,
peterschrammel and
tautschnig
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #7087 +/- ##
===========================================
- Coverage 77.85% 77.84% -0.01%
===========================================
Files 1574 1574
Lines 181235 181435 +200
===========================================
+ Hits 141099 141246 +147
- Misses 40136 40189 +53
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
remi-delmas-3000
force-pushed
the
frees-clause-improvements
branch
2 times, most recently
from
7edced4 to
62a0609
Compare
Add new functions to specify assignable targets in assigns clauses: - add type __CPROVER_assignable_t - add builtin __CPROVER_assignable - add builtin __CPROVER_whole_object - add builtin __CPROVER_object_upto - add builtin __CPROVER_typed_target - allow function call expressions as assigns clause targets as long as they have the return type __CPROVER_assignable_t and are one of the built-ins. Add support for `__CPROVER_frees()` clauses to the contract language to let users specify the pointers a function (or loop) is allowed to free.
remi-delmas-3000
force-pushed
the
frees-clause-improvements
branch
2 times, most recently
from
626fac5 to
133116d
Compare
Add the following to the front-end: - add `__CPROVER_freeable_t` built-in type - add `__CPROVER_freeable` built-in function - allow calls to `__CPROVER_freeable_t` functions in frees clauses - add `__CPROVER_is_freeable` built-in predicate - add `__CPROVER_is_freed` built-in predicate The predicates are not yet supported in the back-end.
remi-delmas-3000
force-pushed
the
frees-clause-improvements
branch
from
133116d to
eeb0728
Compare
feliperodri
added
aws
feliperodri
reviewed
Aug 31, 2022
Collaborator
feliperodri
left a comment
feliperodri
left a comment
There was a problem hiding this comment.
Left a few comments, but I will get another review after merging previous PR (or moving all frees clauses code over here and kill dependency).
Comment on lines
+793
to
+795
| error().source_location = expr.source_location(); | ||
| error() << id2string(id) + " is not allowed in preconditions." << eom; | ||
| throw 0; |
Collaborator
There was a problem hiding this comment.
I guess the previous PR contains this test case, right?
| if(code.find(ID_C_spec_frees).is_not_nil()) | ||
| { | ||
| typecheck_spec_frees( | ||
| static_cast<unary_exprt &>(code.add(ID_C_spec_frees)).op().operands()); |
Collaborator
There was a problem hiding this comment.
Why no coverage here?
| { | ||
| error().source_location = target.source_location(); | ||
| error() << "function pointer calls not allowed in frees clauses" << eom; | ||
| throw 0; |
Comment on lines
+1029
to
+1032
| bool has_freeable_type = | ||
| (type.id() == ID_empty) && | ||
| (type.get(ID_C_typedef) == CPROVER_PREFIX "freeable_t"); | ||
| if(!has_freeable_type) |
Collaborator
There was a problem hiding this comment.
Suggested change
| bool has_freeable_type = | |
| (type.id() == ID_empty) && | |
| (type.get(ID_C_typedef) == CPROVER_PREFIX "freeable_t"); | |
| if(!has_freeable_type) | |
| if((type.id() == ID_empty) && | |
| (type.get(ID_C_typedef) == CPROVER_PREFIX "freeable_t")) |
Collaborator
Author
There was a problem hiding this comment.
I like naming what is being checked to make the intent more explicit.
| const std::function<void(exprt &)> typecheck_target = [&](exprt &target) { | ||
| typecheck_spec_frees_target(target); | ||
| }; | ||
| typecheck_conditional_targets(targets, typecheck_target, "frees"); |
Collaborator
There was a problem hiding this comment.
Should "frees" and "assigns" be a macro?
Collaborator
Author
There was a problem hiding this comment.
what is wrong with std::function ?
| { | ||
| $$=$1; | ||
| set($$, ID_C_spec_frees); | ||
| parser_stack($$).add_to_operands(exprt(ID_target_list)); |
Collaborator
Author
|
Superseded by #7091 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Depends on #7086.
The first commit in this PR is from #7086, please do not read.
The second commit adds the following to the front-end:
__CPROVER_freeable_tbuilt-in type__CPROVER_freeablebuilt-in function__CPROVER_freeable_tfunctions in frees clauses__CPROVER_is_freeablebuilt-in predicate__CPROVER_is_freedbuilt-in predicateThe predicates are not yet supported in the back-end and behave as nondet functions
The build fails with ubuntu 18.04 and I am not sure why, since no error is visible on the output.