Don't ICE on anonymous struct in enum variant
This commit is contained in:
parent
1bb3a9f67a
commit
35a9e73521
4 changed files with 41 additions and 1 deletions
|
@ -3004,6 +3004,11 @@ impl<'hir> Item<'hir> {
|
||||||
matches!(self.kind, ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Union(..))
|
matches!(self.kind, ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Union(..))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Check if this is an [`ItemKind::Struct`] or [`ItemKind::Union`].
|
||||||
|
pub fn is_struct_or_union(&self) -> bool {
|
||||||
|
matches!(self.kind, ItemKind::Struct(..) | ItemKind::Union(..))
|
||||||
|
}
|
||||||
|
|
||||||
expect_methods_self_kind! {
|
expect_methods_self_kind! {
|
||||||
expect_extern_crate, Option<Symbol>, ItemKind::ExternCrate(s), *s;
|
expect_extern_crate, Option<Symbol>, ItemKind::ExternCrate(s), *s;
|
||||||
|
|
||||||
|
|
|
@ -1025,7 +1025,15 @@ fn adt_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::AdtDef<'_> {
|
||||||
|
|
||||||
let is_anonymous = item.ident.name == kw::Empty;
|
let is_anonymous = item.ident.name == kw::Empty;
|
||||||
let repr = if is_anonymous {
|
let repr = if is_anonymous {
|
||||||
tcx.adt_def(tcx.local_parent(def_id)).repr()
|
let parent = tcx.local_parent(def_id);
|
||||||
|
if let Node::Item(item) = tcx.hir_node_by_def_id(parent)
|
||||||
|
&& item.is_struct_or_union()
|
||||||
|
{
|
||||||
|
tcx.adt_def(parent).repr()
|
||||||
|
} else {
|
||||||
|
tcx.dcx().span_delayed_bug(item.span, "anonymous field inside non struct/union");
|
||||||
|
ty::ReprOptions::default()
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
tcx.repr_options_of_def(def_id.to_def_id())
|
tcx.repr_options_of_def(def_id.to_def_id())
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
#![crate_type = "lib"]
|
||||||
|
#![feature(unnamed_fields)]
|
||||||
|
#![allow(unused, incomplete_features)]
|
||||||
|
|
||||||
|
enum K {
|
||||||
|
M {
|
||||||
|
_ : struct { field: u8 },
|
||||||
|
//~^ error: unnamed fields are not allowed outside of structs or unions
|
||||||
|
//~| error: anonymous structs are not allowed outside of unnamed struct or union fields
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
error: unnamed fields are not allowed outside of structs or unions
|
||||||
|
--> $DIR/anon-struct-in-enum-issue-121446.rs:7:9
|
||||||
|
|
|
||||||
|
LL | _ : struct { field: u8 },
|
||||||
|
| -^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
| |
|
||||||
|
| unnamed field declared here
|
||||||
|
|
||||||
|
error: anonymous structs are not allowed outside of unnamed struct or union fields
|
||||||
|
--> $DIR/anon-struct-in-enum-issue-121446.rs:7:13
|
||||||
|
|
|
||||||
|
LL | _ : struct { field: u8 },
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^ anonymous struct declared here
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue