-
Notifications
You must be signed in to change notification settings - Fork 14k
Guard HIR lowered contracts with contract_checks
#144438
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
Merged
+596
−209
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e4ead0e
Guard HIR lowered contracts with contract_checks
dawidl022 2d87527
Guard HIR contracts based on compiler flag rather than lang_item
dawidl022 2a5dac7
Remove no longer used contract_checks intrinsic
dawidl022 a172a66
Wrap contract clauses in brances instead of parenthesis
dawidl022 4d23c41
Test cross-crate runtime contract checks
dawidl022 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| //@ [unchk_pass] compile-flags: -Zcontract-checks=no | ||
| //@ [unchk_fail] compile-flags: -Zcontract-checks=yes | ||
| //@ [chk_pass] compile-flags: -Zcontract-checks=no | ||
| //@ [chk_fail] compile-flags: -Zcontract-checks=yes | ||
|
|
||
| #![crate_type = "lib"] | ||
| #![feature(contracts)] | ||
|
|
||
| extern crate core; | ||
| use core::contracts::requires; | ||
|
|
||
| /// Example function with a spec to be called across a crate boundary. | ||
| #[requires(x > 0)] | ||
| pub fn id_if_positive(x: u32) -> u32 { | ||
| x | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| //@ aux-build:id.rs | ||
| //@ revisions: unchk_pass unchk_fail chk_pass chk_fail | ||
| // | ||
| // The dependency crate `id` can be compiled with runtime contract checking | ||
| // enabled independently of whether this crate is compiled with contract checks | ||
| // or not. | ||
| // | ||
| // chk/unchk indicates whether this crate is compiled with contracts or not | ||
| // and pass/fail indicates whether the `id` crate is compiled with contract checks. | ||
| // | ||
| //@ [unchk_pass] run-pass | ||
| //@ [unchk_fail] run-crash | ||
| //@ [chk_pass] run-pass | ||
| //@ [chk_fail] run-crash | ||
| // | ||
| // | ||
| //@ [unchk_pass] compile-flags: -Zcontract-checks=no | ||
| //@ [unchk_fail] compile-flags: -Zcontract-checks=no | ||
| //@ [chk_pass] compile-flags: -Zcontract-checks=yes | ||
| //@ [chk_fail] compile-flags: -Zcontract-checks=yes | ||
|
|
||
| extern crate id; | ||
|
|
||
| fn main() { | ||
| id::id_if_positive(0); | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't realize it was possible to make aux tests also handle revisions from the aux-test user. Considering the main test properly crashes or passes in all the cases configured here, it does seem to work flawlessly