handle diverging functions forwarding their return place#66827
Merged
bors merged 2 commits intorust-lang:masterfrom Dec 2, 2019
Merged
handle diverging functions forwarding their return place#66827bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
rust-highfive
added
the
S-waiting-on-review
oli-obk
reviewed
Nov 28, 2019
| // (even a ZST read/write) needs to error, so let us make this | ||
| // a NULL place. | ||
| // | ||
| // FIXME: Ideally we'd make sure that the place projections also |
Contributor
There was a problem hiding this comment.
Like just doing a place projection on a null place should error?
Member
Author
There was a problem hiding this comment.
Place projections should have inbounds rules, basically. We have an implementation of that in Miri, and these days I am actually not ashamed of it any more. ;)
But I am worried about the perf impact of this and I think it is currently actually impossible to violate the inbounds requirement, so I didn't bother working on moving that into the core engine.
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 2869aba has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 2869aba with merge d703ed834af1ea4b1c38e85e7dc220786f876865... |
This comment has been minimized.
This comment has been minimized.
Collaborator
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Member
Author
|
Chocolatey was down. @bors retry |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 2869aba with merge 1041db3d91d3f1be462da9124ae0b1b7e16d5a14... |
This comment has been minimized.
This comment has been minimized.
Collaborator
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Contributor
|
@bors retry spurious |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 1, 2019
…oli-obk handle diverging functions forwarding their return place Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places. This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine. r? @oli-obk
bors
added a commit
that referenced
this pull request
Dec 1, 2019
Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost
bors
added a commit
that referenced
this pull request
Dec 1, 2019
Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost
RalfJung
added a commit
to RalfJung/rust
that referenced
this pull request
Dec 2, 2019
…oli-obk handle diverging functions forwarding their return place Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places. This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine. r? @oli-obk
RalfJung
added a commit
to RalfJung/rust
that referenced
this pull request
Dec 2, 2019
…oli-obk handle diverging functions forwarding their return place Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places. This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine. r? @oli-obk
RalfJung
added a commit
to RalfJung/rust
that referenced
this pull request
Dec 2, 2019
…oli-obk handle diverging functions forwarding their return place Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places. This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine. r? @oli-obk
bors
added a commit
that referenced
this pull request
Dec 2, 2019
Rollup of 5 pull requests Successful merges: - #66245 (Conditional compilation for sanitizers) - #66654 (Handle const-checks for `&mut` outside of `HasMutInterior`) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66834 (rustbuild fixes) Failed merges: r? @ghost
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Dec 2, 2019
Test diverging closure coercion Adds a test for #1075. Depends on rust-lang/rust#66827.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places.
This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine.
r? @oli-obk