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

Don't ICE on anonymous struct in enum variant #121470

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

clubby789
Copy link
Contributor

@clubby789 clubby789 commented Feb 22, 2024

Fixes #121446

Computing adt_def for the anon struct calls adt_def on the parent to find its repr. If the parent is a non-item (e.g. an enum variant) we should have already emitted at least one error, so we just use the repr of the anonymous struct to avoid an ICE.

cc @frank-king

@rustbot
Copy link
Collaborator

rustbot commented Feb 22, 2024

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 22, 2024
@clubby789 clubby789 added F-unnamed_fields `#![feature(unnamed_fields)]` T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2024
Copy link
Member

@fmease fmease left a comment

Choose a reason for hiding this comment

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

Thanks! Two nits, then r=me

compiler/rustc_hir_analysis/src/collect.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/collect.rs Outdated Show resolved Hide resolved
@fmease
Copy link
Member

fmease commented Feb 23, 2024

@bors rollup

@rust-cloud-vms rust-cloud-vms bot force-pushed the anon-struct-in-enum branch from a7635b8 to 94e251f Compare February 23, 2024 11:04
@rust-cloud-vms rust-cloud-vms bot force-pushed the anon-struct-in-enum branch from 94e251f to 3d2aa6b Compare February 23, 2024 11:26
@rust-cloud-vms rust-cloud-vms bot force-pushed the anon-struct-in-enum branch from 3d2aa6b to 35a9e73 Compare February 23, 2024 12:25
@fmease
Copy link
Member

fmease commented Feb 23, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Feb 23, 2024

📌 Commit 35a9e73 has been approved by fmease

It is now in the queue for this repository.

@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 Feb 23, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 23, 2024
…mease

Don't ICE on anonymous struct in enum variant

Fixes rust-lang#121446

Computing `adt_def` for the anon struct calls `adt_def` on the parent to find its repr. If the parent is a non-item (e.g. an enum variant) we should have already emitted at least one error, so we just use the repr of the anonymous struct to avoid an ICE.

cc `@frank-king`
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#120742 (mark `min_exhaustive_patterns` as complete)
 - rust-lang#121470 (Don't ICE on anonymous struct in enum variant)
 - rust-lang#121492 (coverage: Rename `is_closure` to `is_hole`)
 - rust-lang#121495 (remove repetitive words)
 - rust-lang#121498 (Make QNX/NTO specific "timespec capping" public to crate::sys)
 - rust-lang#121510 (lint-overflowing-ops: unify cases and remove redundancy)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4d5c4e5 into rust-lang:master Feb 23, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2024
Rollup merge of rust-lang#121470 - clubby789:anon-struct-in-enum, r=fmease

Don't ICE on anonymous struct in enum variant

Fixes rust-lang#121446

Computing `adt_def` for the anon struct calls `adt_def` on the parent to find its repr. If the parent is a non-item (e.g. an enum variant) we should have already emitted at least one error, so we just use the repr of the anonymous struct to avoid an ICE.

cc ``@frank-king``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-unnamed_fields `#![feature(unnamed_fields)]` 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.

ICE: expected ADT to be an item
4 participants