Skip to content

Commit a238c1d

Browse files
khyperiakhyperia
committed
Support DefKind::InlineConst in UnevaluatedConst
1 parent f28ac76 commit a238c1d

15 files changed

Lines changed: 106 additions & 117 deletions

File tree

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2788,7 +2788,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
27882788
}
27892789
ExprKind::ConstBlock(anon_const) => {
27902790
let def_id = self.local_def_id(anon_const.id);
2791-
assert_eq!(DefKind::AnonConst, self.tcx.def_kind(def_id));
2791+
assert_eq!(DefKind::InlineConst, self.tcx.def_kind(def_id));
27922792
self.lower_anon_const_to_const_arg(anon_const, span)
27932793
}
27942794
_ => overly_complex_const(self),

‎compiler/rustc_borrowck/src/universal_regions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
615615

616616
BodyOwnerKind::Const { .. } | BodyOwnerKind::Static(..) => {
617617
match tcx.def_kind(self.mir_def) {
618-
DefKind::InlineConst => {
618+
DefKind::InlineConst if !tcx.is_type_system_inline_const(self.mir_def) => {
619619
// This is required for `AscribeUserType` canonical query, which will call
620620
// `type_of(inline_const_def_id)`. That `type_of` would inject erased lifetimes
621621
// into borrowck, which is ICE #78174.

‎compiler/rustc_hir/src/def.rs‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -448,43 +448,6 @@ impl DefKind {
448448
| DefKind::ExternCrate => false,
449449
}
450450
}
451-
452-
/// Returns `true` if `self` is a kind of definition that does not have its own
453-
/// type-checking context, i.e. closure, coroutine or inline const.
454-
#[inline]
455-
pub fn is_typeck_child(self) -> bool {
456-
match self {
457-
DefKind::Closure | DefKind::InlineConst | DefKind::SyntheticCoroutineBody => true,
458-
DefKind::Mod
459-
| DefKind::Struct
460-
| DefKind::Union
461-
| DefKind::Enum
462-
| DefKind::Variant
463-
| DefKind::Trait
464-
| DefKind::TyAlias
465-
| DefKind::ForeignTy
466-
| DefKind::TraitAlias
467-
| DefKind::AssocTy
468-
| DefKind::TyParam
469-
| DefKind::Fn
470-
| DefKind::Const { .. }
471-
| DefKind::ConstParam
472-
| DefKind::Static { .. }
473-
| DefKind::Ctor(_, _)
474-
| DefKind::AssocFn
475-
| DefKind::AssocConst { .. }
476-
| DefKind::Macro(_)
477-
| DefKind::ExternCrate
478-
| DefKind::Use
479-
| DefKind::ForeignMod
480-
| DefKind::AnonConst
481-
| DefKind::OpaqueTy
482-
| DefKind::Field
483-
| DefKind::LifetimeParam
484-
| DefKind::GlobalAsm
485-
| DefKind::Impl { .. } => false,
486-
}
487-
}
488451
}
489452

490453
/// The resolution of a path or export.

‎compiler/rustc_hir_analysis/src/collect.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! crate as a kind of pass. This should eventually be factored away.
1616
1717
use std::cell::Cell;
18-
use std::{assert_matches, iter};
18+
use std::{assert_matches, debug_assert_matches, iter};
1919

2020
use rustc_abi::{ExternAbi, Size};
2121
use rustc_ast::Recovered;
@@ -1630,10 +1630,12 @@ fn const_param_default<'tcx>(
16301630
}
16311631

16321632
fn anon_const_kind<'tcx>(tcx: TyCtxt<'tcx>, def: LocalDefId) -> ty::AnonConstKind {
1633+
debug_assert_matches!(tcx.def_kind(def), DefKind::AnonConst | DefKind::InlineConst);
16331634
let hir_id = tcx.local_def_id_to_hir_id(def);
16341635
let const_arg_id = tcx.parent_hir_id(hir_id);
16351636
match tcx.hir_node(const_arg_id) {
1636-
hir::Node::ConstArg(_) => {
1637+
hir::Node::ConstArg(const_arg) => {
1638+
debug_assert_matches!(const_arg.kind, hir::ConstArgKind::Anon(hir::AnonConst { def_id, .. }) if *def_id == def);
16371639
let parent_hir_node = tcx.hir_node(tcx.parent_hir_id(const_arg_id));
16381640
if tcx.features().generic_const_exprs() {
16391641
ty::AnonConstKind::GCE

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
482482
let tcx = self.tcx();
483483
let parent_def_id = self.item_def_id();
484484
if let Res::Def(DefKind::ConstParam, _) = res
485-
&& tcx.def_kind(parent_def_id) == DefKind::AnonConst
485+
&& matches!(tcx.def_kind(parent_def_id), DefKind::AnonConst | DefKind::InlineConst)
486486
&& let ty::AnonConstKind::MCG = tcx.anon_const_kind(parent_def_id)
487487
{
488488
let folder = ForbidParamUsesFolder {
@@ -513,6 +513,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
513513
// nearest enclosing AnonConst and use that to determine the context.
514514
let anon_const_def_id = match tcx.def_kind(parent_def_id) {
515515
DefKind::AnonConst => parent_def_id,
516+
DefKind::InlineConst if tcx.is_type_system_inline_const(parent_def_id) => parent_def_id,
516517
DefKind::InlineConst | DefKind::Closure => {
517518
let root = tcx.typeck_root_def_id(parent_def_id.into());
518519
match tcx.def_kind(root) {

‎compiler/rustc_hir_analysis/src/lib.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,13 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
186186
}
187187
_ => (),
188188
}
189-
// Skip `AnonConst`s because we feed their `type_of`.
189+
// Skip `AnonConst`s and type system `InlineConst`s because we feed their `type_of` in
190+
// `feed_anon_const_type`.
190191
// Also skip items for which typeck forwards to parent typeck.
191-
if !(matches!(def_kind, DefKind::AnonConst) || def_kind.is_typeck_child()) {
192+
if !(def_kind == DefKind::AnonConst
193+
|| def_kind == DefKind::InlineConst && tcx.is_type_system_inline_const(item_def_id)
194+
|| tcx.is_typeck_child(item_def_id.to_def_id()))
195+
{
192196
tcx.ensure_ok().typeck(item_def_id);
193197
}
194198
// Ensure we generate the new `DefId` before finishing `check_crate`.

‎compiler/rustc_metadata/src/rmeta/encoder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16241624
<- tcx.explicit_implied_const_bounds(def_id).skip_binder());
16251625
}
16261626
}
1627-
if let DefKind::AnonConst = def_kind {
1627+
if let DefKind::AnonConst | DefKind::InlineConst = def_kind {
16281628
record!(self.tables.anon_const_kind[def_id] <- self.tcx.anon_const_kind(def_id));
16291629
}
16301630
if should_encode_const_of_item(self.tcx, def_id, def_kind) {

‎compiler/rustc_middle/src/hir/map.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans};
2222
use crate::hir::{ModuleItems, ProjectedMaybeOwner, nested_filter};
2323
use crate::middle::debugger_visualizer::DebuggerVisualizerFile;
2424
use crate::query::{IntoQueryKey, LocalCrate};
25-
use crate::ty::TyCtxt;
25+
use crate::ty::{self, TyCtxt};
2626

2727
/// An iterator that walks up the ancestor tree of a given `HirId`.
2828
/// Constructed using `tcx.hir_parent_iter(hir_id)`.
@@ -1108,6 +1108,12 @@ impl<'tcx> TyCtxt<'tcx> {
11081108
}
11091109
}
11101110

1111+
pub fn is_type_system_inline_const(self, def_id: impl IntoQueryKey<DefId>) -> bool {
1112+
let def_id = def_id.into_query_key();
1113+
debug_assert_eq!(self.def_kind(def_id), DefKind::InlineConst);
1114+
self.anon_const_kind(def_id) != ty::AnonConstKind::NonTypeSystem
1115+
}
1116+
11111117
pub fn hir_maybe_get_struct_pattern_shorthand_field(self, expr: &Expr<'_>) -> Option<Symbol> {
11121118
let local = match expr {
11131119
Expr {

‎compiler/rustc_middle/src/ty/context.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,14 @@ impl<'tcx> TyCtxt<'tcx> {
601601
/// effect. However, we do not want this as a general capability, so this interface restricts
602602
/// to the only allowed case.
603603
pub fn feed_anon_const_type(self, key: LocalDefId, value: ty::EarlyBinder<'tcx, Ty<'tcx>>) {
604-
debug_assert_eq!(self.def_kind(key), DefKind::AnonConst);
604+
if cfg!(debug_assertions) {
605+
match self.def_kind(key) {
606+
DefKind::AnonConst => (),
607+
DefKind::InlineConst => assert!(self.is_type_system_inline_const(key)),
608+
def_kind => bug!("unexpected DefKind in feed_anon_const_type: {def_kind:?}"),
609+
}
610+
}
611+
605612
TyCtxtFeed { tcx: self, key }.type_of(value)
606613
}
607614

‎compiler/rustc_middle/src/ty/util.rs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,38 @@ impl<'tcx> TyCtxt<'tcx> {
597597
/// Returns `true` if `def_id` refers to a definition that does not have its own
598598
/// type-checking context, i.e. closure, coroutine or inline const.
599599
pub fn is_typeck_child(self, def_id: DefId) -> bool {
600-
self.def_kind(def_id).is_typeck_child()
600+
match self.def_kind(def_id) {
601+
DefKind::InlineConst => !self.is_type_system_inline_const(def_id),
602+
DefKind::Closure | DefKind::SyntheticCoroutineBody => true,
603+
DefKind::Mod
604+
| DefKind::Struct
605+
| DefKind::Union
606+
| DefKind::Enum
607+
| DefKind::Variant
608+
| DefKind::Trait
609+
| DefKind::TyAlias
610+
| DefKind::ForeignTy
611+
| DefKind::TraitAlias
612+
| DefKind::AssocTy
613+
| DefKind::TyParam
614+
| DefKind::Fn
615+
| DefKind::Const { .. }
616+
| DefKind::ConstParam
617+
| DefKind::Static { .. }
618+
| DefKind::Ctor(_, _)
619+
| DefKind::AssocFn
620+
| DefKind::AssocConst { .. }
621+
| DefKind::Macro(_)
622+
| DefKind::ExternCrate
623+
| DefKind::Use
624+
| DefKind::ForeignMod
625+
| DefKind::AnonConst
626+
| DefKind::OpaqueTy
627+
| DefKind::Field
628+
| DefKind::LifetimeParam
629+
| DefKind::GlobalAsm
630+
| DefKind::Impl { .. } => false,
631+
}
601632
}
602633

603634
/// Returns `true` if `def_id` refers to a trait (i.e., `trait Foo { ... }`).

0 commit comments

Comments
 (0)