Skip to content
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

let caller of check_ptr_access_align control the error message #66081

Merged
merged 1 commit into from
Nov 6, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 4, 2019

This is needed for rust-lang/miri#1031

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 4, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Nov 5, 2019

r? @oli-obk (this is a tiny PR, but priority is also low)

@rust-highfive rust-highfive assigned oli-obk and unassigned zackmdavis Nov 5, 2019
@zackmdavis
Copy link
Member

r? @zackmdavis (not dead, just having a bad year)

I like the "Display impl on an enum specifies the finite set of error messages" strategy.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 5, 2019

📌 Commit b4dde36 has been approved by zackmdavis

@rust-highfive rust-highfive assigned zackmdavis and unassigned oli-obk Nov 5, 2019
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 5, 2019
let caller of check_ptr_access_align control the error message

This is needed for rust-lang/miri#1031
Centril added a commit to Centril/rust that referenced this pull request Nov 6, 2019
let caller of check_ptr_access_align control the error message

This is needed for rust-lang/miri#1031
bors added a commit that referenced this pull request Nov 6, 2019
Rollup of 11 pull requests

Successful merges:

 - #65892 (Remove `PartialEq` and `Eq` from the `SpecialDerives`.)
 - #66014 (Show type parameter name and definition in type mismatch error messages )
 - #66027 (Move has_panic_handler to query)
 - #66054 (syntax: Avoid span arithmetic for delimiter tokens)
 - #66068 (use silent emitter for rustdoc highlighting pass)
 - #66081 (let caller of check_ptr_access_align control the error message)
 - #66093 (Do not ICE with a precision flag in formatting str and no format arguments)
 - #66098 (Detect `::` -> `:` typo when involving turbofish)
 - #66101 (Tweak type mismatch caused by break on tail expr)
 - #66106 (Fix typo in explanation of `E0080`)
 - #66115 (rustc: remove "GlobalMetaData" dead code from hir::map::definitions.)

Failed merges:

r? @ghost
@bors bors merged commit b4dde36 into rust-lang:master Nov 6, 2019
bors added a commit to rust-lang/miri that referenced this pull request Nov 6, 2019
Refactor ptr_offset_inbounds

I finally found a way to write this using basically just `check_ptr_access` while handling all cases (integers and pointers, offset 0 or not) correctly. This changes behavior for NULL ptrs, but I think the change is for the better.

Depends on rust-lang/rust#66081.
bors added a commit to rust-lang/miri that referenced this pull request Nov 6, 2019
Refactor ptr_offset_inbounds

I finally found a way to write this using basically just `check_ptr_access` while handling all cases (integers and pointers, offset 0 or not) correctly. This changes behavior for NULL ptrs, but I think the change is for the better.

Depends on rust-lang/rust#66081.
@RalfJung RalfJung deleted the ptr-offset branch November 6, 2019 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants