miri engine: add option to use force_int for alignment check #75592
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
rust-highfive
added
the
S-waiting-on-review
oli-obk
approved these changes
Aug 17, 2020
| // We instead have to fall back to converting to an integer and checking | ||
| // the "real" alignment. | ||
| throw_ub!(AlignmentCheckFailed { has: alloc_align, required: align }); | ||
| if M::force_int_for_alignment_check(&self.extra) { |
There was a problem hiding this comment.
I was thinking we could make the hook do the check, but I guess that would lead to a lot of duplication in miri where we want to be able to choose between both options at runtime.
There was a problem hiding this comment.
Yeah, also I'd rather have all the checking code in one place. This is critical code to get right.
|
@bors r=oli-obk |
|
📌 Commit 6da8503 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions, checks-azure |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Aug 17, 2020
Tested on commit rust-lang/rust@8cdc94e. Direct link to PR: <rust-lang/rust#75592> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Aug 17, 2020
add option to use force_int for alignment check Fixes #1074. Depends on rust-lang/rust#75592.
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.
This is needed for rust-lang/miri#1074. The Miri-side patch is at rust-lang/miri#1513.
r? @oli-obk