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

Only emit pointer-like metadata for Box<T, A> when A is ZST #94728

Merged
merged 1 commit into from
Mar 11, 2022

Conversation

compiler-errors
Copy link
Member

Basically copy the change in #94043, but for debuginfo.

r? @michaelwoerister

Fixes #94725

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 8, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 8, 2022
@@ -1,4 +1,4 @@
// check-pass
// build-pass
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out we need build-pass to emit the metadata to trigger these tests, oopsies.

@michaelwoerister
Copy link
Member

Thanks, @compiler-errors! Looks good to me.

I think that, eventually, we'll want to remove special casing for Box debuginfo altogether.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2022

📌 Commit 307ee94 has been approved by michaelwoerister

@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 Mar 10, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 10, 2022
…eta, r=michaelwoerister

Only emit pointer-like metadata for `Box<T, A>` when `A` is ZST

Basically copy the change in rust-lang#94043, but for debuginfo.

r? `@michaelwoerister`

Fixes rust-lang#94725
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#93950 (Use modern formatting for format! macros)
 - rust-lang#94274 (Treat unstable lints as unknown)
 - rust-lang#94368 ([1/2] Implement macro meta-variable expressions)
 - rust-lang#94719 (Statically compile libstdc++ everywhere if asked)
 - rust-lang#94728 (Only emit pointer-like metadata for `Box<T, A>` when `A` is ZST)
 - rust-lang#94790 (enable portable-simd doctests in Miri)
 - rust-lang#94811 (Update browser-ui-test version)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b18b2d1 into rust-lang:master Mar 11, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 11, 2022
@compiler-errors compiler-errors deleted the box-allocator-zst-meta branch April 7, 2022 04:30
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

debug assertion failure: debuginfo + feature(allocator_api):
5 participants