Skip to content

Commit 79ce092

Browse files
camelidcamelid
committed
hir: Create hir::ConstArgKind enum
This will allow lowering const params to a dedicated enum variant, rather than to an `AnonConst` that is later examined during `ty` lowering.
1 parent a595f32 commit 79ce092

File tree

13 files changed

+113
-42
lines changed

13 files changed

+113
-42
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ use rustc_data_structures::sorted_map::SortedMap;
4949
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
5050
use rustc_data_structures::sync::Lrc;
5151
use rustc_errors::{DiagArgFromDisplay, DiagCtxt, StashKey};
52-
use rustc_hir as hir;
5352
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
5453
use rustc_hir::def_id::{LocalDefId, LocalDefIdMap, CRATE_DEF_ID, LOCAL_CRATE};
54+
use rustc_hir::{self as hir, ConstArgKind};
5555
use rustc_hir::{
5656
ConstArg, GenericArg, HirId, ItemLocalMap, MissingLifetimeKind, ParamName, TraitCandidate,
5757
};
@@ -1180,7 +1180,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
11801180
})
11811181
});
11821182
return GenericArg::Const(ConstArg {
1183-
value: ct,
1183+
kind: ConstArgKind::Anon(ct),
11841184
is_desugared_from_effects: false,
11851185
});
11861186
}
@@ -1191,7 +1191,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
11911191
GenericArg::Type(self.lower_ty(ty, itctx))
11921192
}
11931193
ast::GenericArg::Const(ct) => GenericArg::Const(ConstArg {
1194-
value: self.lower_anon_const(ct),
1194+
kind: ConstArgKind::Anon(self.lower_anon_const(ct)),
11951195
is_desugared_from_effects: false,
11961196
}),
11971197
}
@@ -2649,7 +2649,12 @@ impl<'hir> GenericArgsCtor<'hir> {
26492649

26502650
lcx.children.push((def_id, hir::MaybeOwner::NonOwner(hir_id)));
26512651
self.args.push(hir::GenericArg::Const(hir::ConstArg {
2652-
value: lcx.arena.alloc(hir::AnonConst { def_id, hir_id, body, span }),
2652+
kind: hir::ConstArgKind::Anon(lcx.arena.alloc(hir::AnonConst {
2653+
def_id,
2654+
hir_id,
2655+
body,
2656+
span,
2657+
})),
26532658
is_desugared_from_effects: true,
26542659
}))
26552660
}

‎compiler/rustc_hir/src/hir.rs

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,30 @@ impl<'hir> PathSegment<'hir> {
230230

231231
#[derive(Clone, Copy, Debug, HashStable_Generic)]
232232
pub struct ConstArg<'hir> {
233-
pub value: &'hir AnonConst,
233+
pub kind: ConstArgKind<'hir>,
234234
/// Indicates whether this comes from a `~const` desugaring.
235235
pub is_desugared_from_effects: bool,
236236
}
237237

238+
impl<'hir> ConstArg<'hir> {
239+
pub fn span(&self) -> Span {
240+
match self.kind {
241+
ConstArgKind::Anon(anon) => anon.span,
242+
}
243+
}
244+
245+
pub fn hir_id(&self) -> HirId {
246+
match self.kind {
247+
ConstArgKind::Anon(anon) => anon.hir_id,
248+
}
249+
}
250+
}
251+
252+
#[derive(Clone, Copy, Debug, HashStable_Generic)]
253+
pub enum ConstArgKind<'hir> {
254+
Anon(&'hir AnonConst),
255+
}
256+
238257
#[derive(Clone, Copy, Debug, HashStable_Generic)]
239258
pub struct InferArg {
240259
pub hir_id: HirId,
@@ -260,7 +279,7 @@ impl GenericArg<'_> {
260279
match self {
261280
GenericArg::Lifetime(l) => l.ident.span,
262281
GenericArg::Type(t) => t.span,
263-
GenericArg::Const(c) => c.value.span,
282+
GenericArg::Const(c) => c.span(),
264283
GenericArg::Infer(i) => i.span,
265284
}
266285
}
@@ -269,7 +288,7 @@ impl GenericArg<'_> {
269288
match self {
270289
GenericArg::Lifetime(l) => l.hir_id,
271290
GenericArg::Type(t) => t.hir_id,
272-
GenericArg::Const(c) => c.value.hir_id,
291+
GenericArg::Const(c) => c.hir_id(),
273292
GenericArg::Infer(i) => i.hir_id,
274293
}
275294
}

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@ pub trait Visitor<'v>: Sized {
347347
fn visit_inline_const(&mut self, c: &'v ConstBlock) -> Self::Result {
348348
walk_inline_const(self, c)
349349
}
350+
fn visit_const_arg(&mut self, c: &'v ConstArg<'v>) -> Self::Result {
351+
walk_const_arg(self, c)
352+
}
350353
fn visit_expr(&mut self, ex: &'v Expr<'v>) -> Self::Result {
351354
walk_expr(self, ex)
352355
}
@@ -729,6 +732,15 @@ pub fn walk_inline_const<'v, V: Visitor<'v>>(
729732
visitor.visit_nested_body(constant.body)
730733
}
731734

735+
pub fn walk_const_arg<'v, V: Visitor<'v>>(
736+
visitor: &mut V,
737+
const_arg: &'v ConstArg<'v>,
738+
) -> V::Result {
739+
match const_arg.kind {
740+
ConstArgKind::Anon(anon) => visitor.visit_anon_const(anon),
741+
}
742+
}
743+
732744
pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>) -> V::Result {
733745
try_visit!(visitor.visit_id(expression.hir_id));
734746
match expression.kind {
@@ -1216,7 +1228,7 @@ pub fn walk_generic_arg<'v, V: Visitor<'v>>(
12161228
match generic_arg {
12171229
GenericArg::Lifetime(lt) => visitor.visit_lifetime(lt),
12181230
GenericArg::Type(ty) => visitor.visit_ty(ty),
1219-
GenericArg::Const(ct) => visitor.visit_anon_const(&ct.value),
1231+
GenericArg::Const(ct) => visitor.visit_const_arg(ct),
12201232
GenericArg::Infer(inf) => visitor.visit_infer(inf),
12211233
}
12221234
}

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
15941594
i += 1;
15951595
}
15961596
GenericArg::Const(ct) => {
1597-
self.visit_anon_const(&ct.value);
1597+
self.visit_const_arg(ct);
15981598
i += 1;
15991599
}
16001600
GenericArg::Infer(inf) => {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ use rustc_ast::ast::ParamKindOrd;
88
use rustc_errors::{
99
codes::*, struct_span_code_err, Applicability, Diag, ErrorGuaranteed, MultiSpan,
1010
};
11-
use rustc_hir as hir;
1211
use rustc_hir::def::{DefKind, Res};
1312
use rustc_hir::def_id::DefId;
1413
use rustc_hir::GenericArg;
14+
use rustc_hir::{self as hir, ConstArgKind};
1515
use rustc_middle::ty::{
1616
self, GenericArgsRef, GenericParamDef, GenericParamDefKind, IsSuggestable, Ty, TyCtxt,
1717
};
@@ -112,7 +112,8 @@ fn generic_arg_mismatch_err(
112112
}
113113
}
114114
(GenericArg::Const(cnst), GenericParamDefKind::Type { .. }) => {
115-
let body = tcx.hir().body(cnst.value.body);
115+
let ConstArgKind::Anon(anon) = cnst.kind;
116+
let body = tcx.hir().body(anon.body);
116117
if let rustc_hir::ExprKind::Path(rustc_hir::QPath::Resolved(_, path)) = body.value.kind
117118
{
118119
if let Res::Def(DefKind::Fn { .. }, id) = path.res {

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,13 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
476476
(&GenericParamDefKind::Type { has_default, .. }, GenericArg::Infer(inf)) => {
477477
handle_ty_args(has_default, &inf.to_ty())
478478
}
479-
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
480-
let did = ct.value.def_id;
481-
tcx.feed_anon_const_type(did, tcx.type_of(param.def_id));
482-
ty::Const::from_anon_const(tcx, did).into()
483-
}
479+
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => match &ct.kind {
480+
hir::ConstArgKind::Anon(anon) => {
481+
let did = anon.def_id;
482+
tcx.feed_anon_const_type(did, tcx.type_of(param.def_id));
483+
ty::Const::from_anon_const(tcx, did).into()
484+
}
485+
},
484486
(&GenericParamDefKind::Const { .. }, hir::GenericArg::Infer(inf)) => {
485487
self.lowerer.ct_infer(Some(param), inf.span).into()
486488
}

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_ast::util::parser::{self, AssocOp, Fixity};
88
use rustc_ast_pretty::pp::Breaks::{Consistent, Inconsistent};
99
use rustc_ast_pretty::pp::{self, Breaks};
1010
use rustc_ast_pretty::pprust::{Comments, PrintState};
11-
use rustc_hir as hir;
11+
use rustc_hir::{self as hir, ConstArgKind};
1212
use rustc_hir::{
1313
BindingMode, ByRef, GenericArg, GenericBound, GenericParam, GenericParamKind, HirId,
1414
LifetimeParamKind, Node, PatKind, RangeEnd, Term, TraitBoundModifier,
@@ -984,6 +984,12 @@ impl<'a> State<'a> {
984984
self.ann.nested(self, Nested::Body(constant.body))
985985
}
986986

987+
fn print_const_arg(&mut self, const_arg: &hir::ConstArg<'_>) {
988+
match &const_arg.kind {
989+
ConstArgKind::Anon(anon) => self.print_anon_const(anon),
990+
}
991+
}
992+
987993
fn print_call_post(&mut self, args: &[hir::Expr<'_>]) {
988994
self.popen();
989995
self.commasep_exprs(Inconsistent, args);
@@ -1672,7 +1678,7 @@ impl<'a> State<'a> {
16721678
GenericArg::Lifetime(lt) if !elide_lifetimes => s.print_lifetime(lt),
16731679
GenericArg::Lifetime(_) => {}
16741680
GenericArg::Type(ty) => s.print_type(ty),
1675-
GenericArg::Const(ct) => s.print_anon_const(&ct.value),
1681+
GenericArg::Const(ct) => s.print_const_arg(ct),
16761682
GenericArg::Infer(_inf) => s.word("_"),
16771683
}
16781684
});

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ use crate::rvalue_scopes;
55
use crate::{BreakableCtxt, Diverges, Expectation, FnCtxt, LoweredTy};
66
use rustc_data_structures::fx::FxHashSet;
77
use rustc_errors::{Applicability, Diag, ErrorGuaranteed, MultiSpan, StashKey};
8-
use rustc_hir as hir;
98
use rustc_hir::def::{CtorOf, DefKind, Res};
109
use rustc_hir::def_id::DefId;
1110
use rustc_hir::lang_items::LangItem;
11+
use rustc_hir::{self as hir, ConstArg, ConstArgKind};
1212
use rustc_hir::{ExprKind, GenericArg, HirId, Node, QPath};
1313
use rustc_hir_analysis::hir_ty_lowering::errors::GenericsArgsErrExtend;
1414
use rustc_hir_analysis::hir_ty_lowering::generics::{
@@ -466,16 +466,24 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
466466
}
467467
}
468468

469-
pub fn lower_const_arg(&self, hir_ct: &hir::AnonConst, param_def_id: DefId) -> ty::Const<'tcx> {
470-
let did = hir_ct.def_id;
471-
self.tcx.feed_anon_const_type(did, self.tcx.type_of(param_def_id));
472-
let ct = ty::Const::from_anon_const(self.tcx, did);
473-
self.register_wf_obligation(
474-
ct.into(),
475-
self.tcx.hir().span(hir_ct.hir_id),
476-
ObligationCauseCode::WellFormed(None),
477-
);
478-
ct
469+
pub fn lower_const_arg(
470+
&self,
471+
const_arg: &ConstArg<'tcx>,
472+
param_def_id: DefId,
473+
) -> ty::Const<'tcx> {
474+
match &const_arg.kind {
475+
ConstArgKind::Anon(anon) => {
476+
let did = anon.def_id;
477+
self.tcx.feed_anon_const_type(did, self.tcx.type_of(param_def_id));
478+
let ct = ty::Const::from_anon_const(self.tcx, did);
479+
self.register_wf_obligation(
480+
ct.into(),
481+
self.tcx.hir().span(anon.hir_id),
482+
ObligationCauseCode::WellFormed(None),
483+
);
484+
ct
485+
}
486+
}
479487
}
480488

481489
// If the type given by the user has free regions, save it for later, since
@@ -1303,7 +1311,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
13031311
self.fcx.lower_ty(ty).raw.into()
13041312
}
13051313
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
1306-
self.fcx.lower_const_arg(&ct.value, param.def_id).into()
1314+
self.fcx.lower_const_arg(ct, param.def_id).into()
13071315
}
13081316
(GenericParamDefKind::Type { .. }, GenericArg::Infer(inf)) => {
13091317
self.fcx.ty_infer(Some(param), inf.span).into()

‎compiler/rustc_hir_typeck/src/method/confirm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
400400
self.cfcx.lower_ty(ty).raw.into()
401401
}
402402
(GenericParamDefKind::Const { .. }, GenericArg::Const(ct)) => {
403-
self.cfcx.lower_const_arg(&ct.value, param.def_id).into()
403+
self.cfcx.lower_const_arg(ct, param.def_id).into()
404404
}
405405
(GenericParamDefKind::Type { .. }, GenericArg::Infer(inf)) => {
406406
self.cfcx.ty_infer(Some(param), inf.span).into()

‎compiler/rustc_lint/src/pass_by_value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fn gen_args(cx: &LateContext<'_>, segment: &PathSegment<'_>) -> String {
7878
.tcx
7979
.sess
8080
.source_map()
81-
.span_to_snippet(c.value.span)
81+
.span_to_snippet(c.span())
8282
.unwrap_or_else(|_| "_".into()),
8383
GenericArg::Infer(_) => String::from("_"),
8484
})

0 commit comments

Comments
 (0)