Skip to content

Commit c0c5a94

Browse files
frank-kingfrank-king
committed
Lower anonymous structs or unions to HIR
1 parent 090d5ea commit c0c5a94

File tree

38 files changed

+289
-174
lines changed

38 files changed

+289
-174
lines changed

‎compiler/rustc_ast/src/ast.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,9 +2098,9 @@ pub enum TyKind {
20982098
/// A tuple (`(A, B, C, D,...)`).
20992099
Tup(ThinVec<P<Ty>>),
21002100
/// An anonymous struct type i.e. `struct { foo: Type }`
2101-
AnonStruct(ThinVec<FieldDef>),
2101+
AnonStruct(NodeId, ThinVec<FieldDef>),
21022102
/// An anonymous union type i.e. `union { bar: Type }`
2103-
AnonUnion(ThinVec<FieldDef>),
2103+
AnonUnion(NodeId, ThinVec<FieldDef>),
21042104
/// A path (`module::module::...::Type`), optionally
21052105
/// "qualified", e.g., `<Vec<T> as SomeTrait>::SomeType`.
21062106
///

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,8 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
514514
visit_vec(bounds, |bound| vis.visit_param_bound(bound));
515515
}
516516
TyKind::MacCall(mac) => vis.visit_mac_call(mac),
517-
TyKind::AnonStruct(fields) | TyKind::AnonUnion(fields) => {
517+
TyKind::AnonStruct(id, fields) | TyKind::AnonUnion(id, fields) => {
518+
vis.visit_id(id);
518519
fields.flat_map_in_place(|field| vis.flat_map_field_def(field));
519520
}
520521
}

‎compiler/rustc_ast/src/visit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) {
441441
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Err => {}
442442
TyKind::MacCall(mac) => visitor.visit_mac_call(mac),
443443
TyKind::Never | TyKind::CVarArgs => {}
444-
TyKind::AnonStruct(ref fields, ..) | TyKind::AnonUnion(ref fields, ..) => {
444+
TyKind::AnonStruct(_, ref fields) | TyKind::AnonUnion(_, ref fields) => {
445445
walk_list!(visitor, visit_field_def, fields)
446446
}
447447
}

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
691691
}
692692
}
693693

694-
fn lower_field_def(&mut self, (index, f): (usize, &FieldDef)) -> hir::FieldDef<'hir> {
694+
pub(super) fn lower_field_def(
695+
&mut self,
696+
(index, f): (usize, &FieldDef),
697+
) -> hir::FieldDef<'hir> {
695698
let ty = if let TyKind::Path(qself, path) = &f.ty.kind {
696699
let t = self.lower_path_ty(
697700
&f.ty,

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,17 +1358,49 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
13581358
TyKind::Err => {
13591359
hir::TyKind::Err(self.dcx().span_delayed_bug(t.span, "TyKind::Err lowered"))
13601360
}
1361-
// FIXME(unnamed_fields): IMPLEMENTATION IN PROGRESS
1362-
#[allow(rustc::untranslatable_diagnostic)]
1363-
#[allow(rustc::diagnostic_outside_of_impl)]
1364-
TyKind::AnonStruct(ref _fields) => {
1365-
hir::TyKind::Err(self.dcx().span_err(t.span, "anonymous structs are unimplemented"))
1366-
}
1367-
// FIXME(unnamed_fields): IMPLEMENTATION IN PROGRESS
1368-
#[allow(rustc::untranslatable_diagnostic)]
1369-
#[allow(rustc::diagnostic_outside_of_impl)]
1370-
TyKind::AnonUnion(ref _fields) => {
1371-
hir::TyKind::Err(self.dcx().span_err(t.span, "anonymous unions are unimplemented"))
1361+
// Lower the anonymous structs or unions in a nested lowering context.
1362+
//
1363+
// ```
1364+
// struct Foo {
1365+
// _: union {
1366+
// // ^__________________ <-- within the nested lowering context,
1367+
// /* fields */ // | we lower all fields defined into an
1368+
// } // | owner node of struct or union item
1369+
// // ^_____________________|
1370+
// }
1371+
//
1372+
TyKind::AnonStruct(def_node_id, fields) | TyKind::AnonUnion(def_node_id, fields) => {
1373+
let (def_kind, item_kind): (DefKind, fn(_, _) -> _) = match t.kind {
1374+
TyKind::AnonStruct(..) => (DefKind::Struct, hir::ItemKind::Struct),
1375+
TyKind::AnonUnion(..) => (DefKind::Union, hir::ItemKind::Union),
1376+
_ => unreachable!(),
1377+
};
1378+
let def_id = self.create_def(
1379+
self.current_hir_id_owner.def_id,
1380+
*def_node_id,
1381+
kw::Empty,
1382+
def_kind,
1383+
t.span,
1384+
);
1385+
debug!(?def_id);
1386+
let owner_id = hir::OwnerId { def_id };
1387+
self.with_hir_id_owner(*def_node_id, |this| {
1388+
let fields = this.arena.alloc_from_iter(
1389+
fields.iter().enumerate().map(|f| this.lower_field_def(f)),
1390+
);
1391+
let span = t.span;
1392+
let variant_data = hir::VariantData::Struct(fields, false);
1393+
// FIXME: capture the generics from the outer adt.
1394+
let generics = hir::Generics::empty();
1395+
hir::OwnerNode::Item(this.arena.alloc(hir::Item {
1396+
ident: Ident::new(kw::Empty, span),
1397+
owner_id,
1398+
kind: item_kind(variant_data, generics),
1399+
span: this.lower_span(span),
1400+
vis_span: this.lower_span(span.shrink_to_lo()),
1401+
}))
1402+
});
1403+
hir::TyKind::AnonAdt(hir::ItemId { owner_id })
13721404
}
13731405
TyKind::Slice(ty) => hir::TyKind::Slice(self.lower_ty(ty, itctx)),
13741406
TyKind::Ptr(mt) => hir::TyKind::Ptr(self.lower_mt(mt, itctx)),

‎compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl<'a> AstValidator<'a> {
214214
}
215215
}
216216
}
217-
TyKind::AnonStruct(ref fields, ..) | TyKind::AnonUnion(ref fields, ..) => {
217+
TyKind::AnonStruct(_, ref fields) | TyKind::AnonUnion(_, ref fields) => {
218218
walk_list!(self, visit_field_def, fields)
219219
}
220220
_ => visit::walk_ty(self, t),

‎compiler/rustc_ast_pretty/src/pprust/state.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,11 +987,11 @@ impl<'a> State<'a> {
987987
}
988988
self.pclose();
989989
}
990-
ast::TyKind::AnonStruct(fields) => {
990+
ast::TyKind::AnonStruct(_, fields) => {
991991
self.head("struct");
992992
self.print_record_struct_body(fields, ty.span);
993993
}
994-
ast::TyKind::AnonUnion(fields) => {
994+
ast::TyKind::AnonUnion(_, fields) => {
995995
self.head("union");
996996
self.print_record_struct_body(fields, ty.span);
997997
}

‎compiler/rustc_hir/src/def.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_data_structures::unord::UnordMap;
88
use rustc_macros::HashStable_Generic;
99
use rustc_span::def_id::{DefId, LocalDefId};
1010
use rustc_span::hygiene::MacroKind;
11+
use rustc_span::symbol::kw;
1112
use rustc_span::Symbol;
1213

1314
use std::array::IntoIter;
@@ -225,6 +226,7 @@ impl DefKind {
225226

226227
pub fn def_path_data(self, name: Symbol) -> DefPathData {
227228
match self {
229+
DefKind::Struct | DefKind::Union if name == kw::Empty => DefPathData::AnonAdt,
228230
DefKind::Mod
229231
| DefKind::Struct
230232
| DefKind::Union

‎compiler/rustc_hir/src/definitions.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ pub enum DefPathData {
287287
/// An existential `impl Trait` type node.
288288
/// Argument position `impl Trait` have a `TypeNs` with their pretty-printed name.
289289
OpaqueTy,
290+
/// An anonymous struct or union type i.e. `struct { foo: Type }` or `union { bar: Type }`
291+
AnonAdt,
290292
}
291293

292294
impl Definitions {
@@ -409,8 +411,9 @@ impl DefPathData {
409411
match *self {
410412
TypeNs(name) if name == kw::Empty => None,
411413
TypeNs(name) | ValueNs(name) | MacroNs(name) | LifetimeNs(name) => Some(name),
414+
412415
Impl | ForeignMod | CrateRoot | Use | GlobalAsm | Closure | Ctor | AnonConst
413-
| OpaqueTy => None,
416+
| OpaqueTy | AnonAdt => None,
414417
}
415418
}
416419

@@ -431,6 +434,7 @@ impl DefPathData {
431434
Ctor => DefPathDataName::Anon { namespace: sym::constructor },
432435
AnonConst => DefPathDataName::Anon { namespace: sym::constant },
433436
OpaqueTy => DefPathDataName::Anon { namespace: sym::opaque },
437+
AnonAdt => DefPathDataName::Anon { namespace: sym::anon_adt },
434438
}
435439
}
436440
}

‎compiler/rustc_hir/src/hir.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2569,6 +2569,8 @@ pub enum TyKind<'hir> {
25692569
Never,
25702570
/// A tuple (`(A, B, C, D, ...)`).
25712571
Tup(&'hir [Ty<'hir>]),
2572+
/// An anonymous struct or union type i.e. `struct { foo: Type }` or `union { foo: Type }`
2573+
AnonAdt(ItemId),
25722574
/// A path to a type definition (`module::module::...::Type`), or an
25732575
/// associated type (e.g., `<Vec<T> as Trait>::Type` or `<T>::Target`).
25742576
///

0 commit comments

Comments
 (0)