properly handle fat pointers to uninhabitable types #94242
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
rustbot
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
Interesting! I'll take a closer look shortly. |
There was a problem hiding this comment.
Thanks for the PR, @compiler-errors! Looks great. I'll be happy to r+ with the comments below addressed.
| @@ -437,19 +438,23 @@ fn pointer_or_reference_metadata<'ll, 'tcx>( | |||
| unique_type_id: UniqueTypeId, | |||
| ) -> MetadataCreationResult<'ll> { | |||
| let pointee_type_metadata = type_metadata(cx, pointee_type); | |||
| let pointee_tail_type = cx.tcx.struct_tail_erasing_lifetimes(pointee_type, cx.param_env()); | |||
There was a problem hiding this comment.
Can you move this into fat_pointer_kind()? Then users of that function don't have to know about struct_tail_erasing_lifetimes().
| @@ -0,0 +1,28 @@ | |||
| // check-pass | |||
| // compile-flags: -Cdebuginfo=2 | |||
|
|
|||
There was a problem hiding this comment.
Please add a comment that this fixes #94149.
|
Also, please squash the commits. |
compiler-errors
force-pushed
the
fat-uninhabitable-pointer
branch
from
4eb6996 to
c73a2f8
Compare
|
Thanks! |
|
📌 Commit c73a2f8 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit c73a2f8 with merge a737eace9493f872ef78cc8014b3f542e4131c8d... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry (crates.io down) |
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Feb 24, 2022
…ointer, r=michaelwoerister properly handle fat pointers to uninhabitable types Calculate the pointee metadata size by using `tcx.struct_tail_erasing_lifetimes` instead of duplicating the logic in `fat_pointer_kind`. Open to alternatively suggestions on how to fix this. Fixes rust-lang#94149 r? `@michaelwoerister` since you touched this code last, I think!
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Feb 24, 2022
…ointer, r=michaelwoerister properly handle fat pointers to uninhabitable types Calculate the pointee metadata size by using `tcx.struct_tail_erasing_lifetimes` instead of duplicating the logic in `fat_pointer_kind`. Open to alternatively suggestions on how to fix this. Fixes rust-lang#94149 r? ``@michaelwoerister`` since you touched this code last, I think!
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Feb 24, 2022
…ointer, r=michaelwoerister properly handle fat pointers to uninhabitable types Calculate the pointee metadata size by using `tcx.struct_tail_erasing_lifetimes` instead of duplicating the logic in `fat_pointer_kind`. Open to alternatively suggestions on how to fix this. Fixes rust-lang#94149 r? ```@michaelwoerister``` since you touched this code last, I think!
This was referenced Feb 24, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 24, 2022
Rollup of 9 pull requests Successful merges: - rust-lang#91795 (resolve/metadata: Stop encoding macros as reexports) - rust-lang#93714 (better ObligationCause for normalization errors in `can_type_implement_copy`) - rust-lang#94175 (Improve `--check-cfg` implementation) - rust-lang#94212 (Stop manually SIMDing in `swap_nonoverlapping`) - rust-lang#94242 (properly handle fat pointers to uninhabitable types) - rust-lang#94308 (Normalize main return type during mono item collection & codegen) - rust-lang#94315 (update auto trait lint for `PhantomData`) - rust-lang#94316 (Improve string literal unescaping) - rust-lang#94327 (Avoid emitting full macro body into JSON errors) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Calculate the pointee metadata size by using
tcx.struct_tail_erasing_lifetimesinstead of duplicating the logic infat_pointer_kind. Open to alternatively suggestions on how to fix this.Fixes #94149
r? @michaelwoerister since you touched this code last, I think!