Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Erase late-bound regions before computing vtable debuginfo name. #90050

Merged

Conversation

michaelwoerister
Copy link
Member

Fixes #90019.

The msvc_enum_fallback() for computing enum type names needs to access the memory layout of niche enums in order to determine the type name. compute_debuginfo_vtable_name() did not properly erase regions before computing type names which made memory layout computation ICE when encountering un-erased regions.

r? @wesleywiser

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2021
@rust-log-analyzer

This comment has been minimized.

@michaelwoerister michaelwoerister force-pushed the fix-vtable-debug-name-crash-90019 branch from 0e6c7a2 to bf39d86 Compare October 19, 2021 11:57
@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 19, 2021

📌 Commit bf39d86 has been approved by wesleywiser

@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 Oct 19, 2021
Co-authored-by: r00ster <r00ster91@protonmail.com>
@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 19, 2021

📌 Commit 5929cf0 has been approved by wesleywiser

@michaelwoerister michaelwoerister added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 20, 2021
@wesleywiser
Copy link
Member

@bors p=1

Fixes stable-to-beta regression.

@bors
Copy link
Contributor

bors commented Oct 20, 2021

⌛ Testing commit 5929cf0 with merge 3d71e74...

@bors
Copy link
Contributor

bors commented Oct 20, 2021

☀️ Test successful - checks-actions
Approved by: wesleywiser
Pushing 3d71e74 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2021
@bors bors merged commit 3d71e74 into rust-lang:master Oct 20, 2021
@rustbot rustbot added this to the 1.58.0 milestone Oct 20, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3d71e74): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 21, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 22, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.58.0, 1.57.0 Oct 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 22, 2021
…ulacrum

[beta] backports

*  Don't emit a warning for empty rmeta files. rust-lang#90072
*  Erase late-bound regions before computing vtable debuginfo name. rust-lang#90050
*  Fix wrong niche calculation when 2+ niches are placed at the start rust-lang#90040
*  Revert rust-lang#86011 to fix an incorrect bound check rust-lang#90025
*  Fix macro_rules! duplication when reexported in the same module rust-lang#89867
* Bump cargo to include rust-lang/cargo#9979 - Fix fetching git repos after a force push.

r? `@Mark-Simulacrum`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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.

cargo fails to build on Windows with nightly
10 participants