CONTRACTS: ensure at most one predicate per pointer #8577
Merged
Conversation
This file contains 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
tautschnig,
feliperodri,
kroening and
peterschrammel
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #8577 +/- ##
========================================
Coverage 78.85% 78.85%
========================================
Files 1732 1732
Lines 199119 199119
Branches 18560 18560
========================================
Hits 157023 157023
Misses 42096 42096 ☔ View full report in Codecov by Sentry. |
|
@tautschnig this one is also ready to merge |
tautschnig
approved these changes
Jan 29, 2025
Comment on lines
1268
to
1275
| // __CPROVER_assert( | ||
| // write_set->linked_ptr_pred_ctx->ptr_pred != ptr1, | ||
| // "__CPROVER_pointer_equals does not conflict with other pointer " | ||
| // "predicate"); | ||
| // write_set->linked_ptr_pred_ctx->ptr_pred = | ||
| // __VERIFIER_nondet___CPROVER_bool() | ||
| // ? ptr1 | ||
| // : write_set->linked_ptr_pred_ctx->ptr_pred; |
There was a problem hiding this comment.
What to take away from this commented-out part?
There was a problem hiding this comment.
Thanks for catching this. I need to fix that and add more tests for predicates used in ensures clauses in contract replacement mode.
…nter predicates in disjunctions.
remi-delmas-3000
force-pushed
the
contracts-ptr-pred-ctx
branch
from
42af48e to
7f7a03c
Compare
Ensures that at most one pointer predicate is positively asserted/assumed per pointer. Before, `is_fresh(p, n) && is_fresh(p, n)` would fail in assertion contexts as expected but pass in assumption contexts by allocating twice.
remi-delmas-3000
force-pushed
the
contracts-ptr-pred-ctx
branch
from
7f7a03c to
bb3307a
Compare
|
@tautschnig test suite now check every combination of conflicting predicates in both requires and ensures clauses for both contract checking and replacement, we're good to go |
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.
Please ignore the first commit, it is from #8576 and will disappear when rebasing.
Fixes a discrepancy between assert and assume behaviour for pointer predicates, by ensuring
that at most one predicate occurrence can be established at all times, in both assume and assert
contexts.
Before,
is_fresh(p, n) && is_fresh(p, n)would fail in assert contexts but pass in assume contextsby allocating twice.