Skip to content

Commit f0b67dd

Browse files
borsbors
committed
Auto merge of #139598 - compiler-errors:no-bound-var-symbol, r=WaffleLapkin
Remove `Symbol` from `Named` variant of `BoundRegionKind`/`LateParamRegionKind` The `Symbol` is redundant, since we already store a `DefId` in the region variant. Instead, load the name via `item_name` when needed (which is almost always on the diagnostic path). This introduces a `BoundRegionKind::NamedAnon` which is used for giving anonymous bound regions names, but which should only be used during pretty printing and error reporting.
2 parents 733b47e + dc8cac8 commit f0b67dd

File tree

47 files changed

+375
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+375
-407
lines changed

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4194,7 +4194,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
41944194
// anything.
41954195
let return_ty = sig.output();
41964196
match return_ty.skip_binder().kind() {
4197-
ty::Ref(return_region, _, _) if return_region.has_name() && !is_closure => {
4197+
ty::Ref(return_region, _, _)
4198+
if return_region.is_named(self.infcx.tcx) && !is_closure =>
4199+
{
41984200
// This is case 1 from above, return type is a named reference so we need to
41994201
// search for relevant arguments.
42004202
let mut arguments = Vec::new();

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,8 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
852852
return;
853853
};
854854

855-
let lifetime = if f.has_name() { fr_name.name } else { kw::UnderscoreLifetime };
855+
let lifetime =
856+
if f.is_named(self.infcx.tcx) { fr_name.name } else { kw::UnderscoreLifetime };
856857

857858
let arg = match param.param.pat.simple_ident() {
858859
Some(simple_ident) => format!("argument `{simple_ident}`"),

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
289289

290290
debug!("give_region_a_name: error_region = {:?}", error_region);
291291
match error_region.kind() {
292-
ty::ReEarlyParam(ebr) => ebr.has_name().then(|| {
292+
ty::ReEarlyParam(ebr) => ebr.is_named().then(|| {
293293
let def_id = tcx.generics_of(self.mir_def_id()).region_param(ebr, tcx).def_id;
294294
let span = tcx.hir_span_if_local(def_id).unwrap_or(DUMMY_SP);
295295
RegionName { name: ebr.name, source: RegionNameSource::NamedEarlyParamRegion(span) }
@@ -300,16 +300,11 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
300300
}
301301

302302
ty::ReLateParam(late_param) => match late_param.kind {
303-
ty::LateParamRegionKind::Named(region_def_id, name) => {
303+
ty::LateParamRegionKind::Named(region_def_id) => {
304304
// Get the span to point to, even if we don't use the name.
305305
let span = tcx.hir_span_if_local(region_def_id).unwrap_or(DUMMY_SP);
306-
debug!(
307-
"bound region named: {:?}, is_named: {:?}",
308-
name,
309-
late_param.kind.is_named()
310-
);
311306

312-
if late_param.kind.is_named() {
307+
if let Some(name) = late_param.kind.get_name(tcx) {
313308
// A named region that is actually named.
314309
Some(RegionName {
315310
name,
@@ -369,6 +364,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
369364
}
370365

371366
ty::LateParamRegionKind::Anon(_) => None,
367+
ty::LateParamRegionKind::NamedAnon(_, _) => bug!("only used for pretty printing"),
372368
},
373369

374370
ty::ReBound(..)
@@ -899,7 +895,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
899895
let ty::ReEarlyParam(region) = self.to_error_region(fr)?.kind() else {
900896
return None;
901897
};
902-
if region.has_name() {
898+
if region.is_named() {
903899
return None;
904900
};
905901

@@ -934,7 +930,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
934930
let ty::ReEarlyParam(region) = self.to_error_region(fr)?.kind() else {
935931
return None;
936932
};
937-
if region.has_name() {
933+
if region.is_named() {
938934
return None;
939935
};
940936

‎compiler/rustc_borrowck/src/nll.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ pub(super) fn dump_nll_mir<'tcx>(
232232
// Also dump the region constraint graph as a graphviz file.
233233
let _: io::Result<()> = try {
234234
let mut file = create_dump_file(tcx, "regioncx.all.dot", false, "nll", &0, body)?;
235-
regioncx.dump_graphviz_raw_constraints(&mut file)?;
235+
regioncx.dump_graphviz_raw_constraints(tcx, &mut file)?;
236236
};
237237

238238
// Also dump the region constraint SCC graph as a graphviz file.
239239
let _: io::Result<()> = try {
240240
let mut file = create_dump_file(tcx, "regioncx.scc.dot", false, "nll", &0, body)?;
241-
regioncx.dump_graphviz_scc_constraints(&mut file)?;
241+
regioncx.dump_graphviz_scc_constraints(tcx, &mut file)?;
242242
};
243243
}
244244

‎compiler/rustc_borrowck/src/polonius/dump.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ fn emit_polonius_dump<'tcx>(
116116
writeln!(out, "<div>")?;
117117
writeln!(out, "NLL regions")?;
118118
writeln!(out, "<pre class='mermaid'>")?;
119-
emit_mermaid_nll_regions(regioncx, out)?;
119+
emit_mermaid_nll_regions(tcx, regioncx, out)?;
120120
writeln!(out, "</pre>")?;
121121
writeln!(out, "</div>")?;
122122

123123
// Section 5: mermaid visualization of the NLL SCC graph.
124124
writeln!(out, "<div>")?;
125125
writeln!(out, "NLL SCCs")?;
126126
writeln!(out, "<pre class='mermaid'>")?;
127-
emit_mermaid_nll_sccs(regioncx, out)?;
127+
emit_mermaid_nll_sccs(tcx, regioncx, out)?;
128128
writeln!(out, "</pre>")?;
129129
writeln!(out, "</div>")?;
130130

@@ -306,9 +306,10 @@ fn emit_mermaid_cfg(body: &Body<'_>, out: &mut dyn io::Write) -> io::Result<()>
306306
}
307307

308308
/// Emits a region's label: index, universe, external name.
309-
fn render_region(
309+
fn render_region<'tcx>(
310+
tcx: TyCtxt<'tcx>,
310311
region: RegionVid,
311-
regioncx: &RegionInferenceContext<'_>,
312+
regioncx: &RegionInferenceContext<'tcx>,
312313
out: &mut dyn io::Write,
313314
) -> io::Result<()> {
314315
let def = regioncx.region_definition(region);
@@ -318,7 +319,7 @@ fn render_region(
318319
if !universe.is_root() {
319320
write!(out, "/{universe:?}")?;
320321
}
321-
if let Some(name) = def.external_name.and_then(|e| e.get_name()) {
322+
if let Some(name) = def.external_name.and_then(|e| e.get_name(tcx)) {
322323
write!(out, " ({name})")?;
323324
}
324325
Ok(())
@@ -327,6 +328,7 @@ fn render_region(
327328
/// Emits a mermaid flowchart of the NLL regions and the outlives constraints between them, similar
328329
/// to the graphviz version.
329330
fn emit_mermaid_nll_regions<'tcx>(
331+
tcx: TyCtxt<'tcx>,
330332
regioncx: &RegionInferenceContext<'tcx>,
331333
out: &mut dyn io::Write,
332334
) -> io::Result<()> {
@@ -336,7 +338,7 @@ fn emit_mermaid_nll_regions<'tcx>(
336338
// Emit the region nodes.
337339
for region in regioncx.definitions.indices() {
338340
write!(out, "{}[\"", region.as_usize())?;
339-
render_region(region, regioncx, out)?;
341+
render_region(tcx, region, regioncx, out)?;
340342
writeln!(out, "\"]")?;
341343
}
342344

@@ -378,6 +380,7 @@ fn emit_mermaid_nll_regions<'tcx>(
378380
/// Emits a mermaid flowchart of the NLL SCCs and the outlives constraints between them, similar
379381
/// to the graphviz version.
380382
fn emit_mermaid_nll_sccs<'tcx>(
383+
tcx: TyCtxt<'tcx>,
381384
regioncx: &RegionInferenceContext<'tcx>,
382385
out: &mut dyn io::Write,
383386
) -> io::Result<()> {
@@ -395,7 +398,7 @@ fn emit_mermaid_nll_sccs<'tcx>(
395398
// The node label: the regions contained in the SCC.
396399
write!(out, "{scc}[\"SCC({scc}) = {{", scc = scc.as_usize())?;
397400
for (idx, &region) in regions.iter().enumerate() {
398-
render_region(region, regioncx, out)?;
401+
render_region(tcx, region, regioncx, out)?;
399402
if idx < regions.len() - 1 {
400403
write!(out, ",")?;
401404
}

‎compiler/rustc_borrowck/src/region_infer/graphviz.rs

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ fn render_universe(u: UniverseIndex) -> String {
2626
format!("/{:?}", u)
2727
}
2828

29-
fn render_region_vid(rvid: RegionVid, regioncx: &RegionInferenceContext<'_>) -> String {
29+
fn render_region_vid<'tcx>(
30+
tcx: TyCtxt<'tcx>,
31+
rvid: RegionVid,
32+
regioncx: &RegionInferenceContext<'tcx>,
33+
) -> String {
3034
let universe_str = render_universe(regioncx.region_definition(rvid).universe);
3135

3236
let external_name_str = if let Some(external_name) =
33-
regioncx.region_definition(rvid).external_name.and_then(|e| e.get_name())
37+
regioncx.region_definition(rvid).external_name.and_then(|e| e.get_name(tcx))
3438
{
3539
format!(" ({external_name})")
3640
} else {
@@ -42,12 +46,20 @@ fn render_region_vid(rvid: RegionVid, regioncx: &RegionInferenceContext<'_>) ->
4246

4347
impl<'tcx> RegionInferenceContext<'tcx> {
4448
/// Write out the region constraint graph.
45-
pub(crate) fn dump_graphviz_raw_constraints(&self, mut w: &mut dyn Write) -> io::Result<()> {
46-
dot::render(&RawConstraints { regioncx: self }, &mut w)
49+
pub(crate) fn dump_graphviz_raw_constraints(
50+
&self,
51+
tcx: TyCtxt<'tcx>,
52+
mut w: &mut dyn Write,
53+
) -> io::Result<()> {
54+
dot::render(&RawConstraints { tcx, regioncx: self }, &mut w)
4755
}
4856

4957
/// Write out the region constraint SCC graph.
50-
pub(crate) fn dump_graphviz_scc_constraints(&self, mut w: &mut dyn Write) -> io::Result<()> {
58+
pub(crate) fn dump_graphviz_scc_constraints(
59+
&self,
60+
tcx: TyCtxt<'tcx>,
61+
mut w: &mut dyn Write,
62+
) -> io::Result<()> {
5163
let mut nodes_per_scc: IndexVec<ConstraintSccIndex, _> =
5264
self.constraint_sccs.all_sccs().map(|_| Vec::new()).collect();
5365

@@ -56,11 +68,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
5668
nodes_per_scc[scc].push(region);
5769
}
5870

59-
dot::render(&SccConstraints { regioncx: self, nodes_per_scc }, &mut w)
71+
dot::render(&SccConstraints { tcx, regioncx: self, nodes_per_scc }, &mut w)
6072
}
6173
}
6274

6375
struct RawConstraints<'a, 'tcx> {
76+
tcx: TyCtxt<'tcx>,
6477
regioncx: &'a RegionInferenceContext<'tcx>,
6578
}
6679

@@ -78,7 +91,7 @@ impl<'a, 'this, 'tcx> dot::Labeller<'this> for RawConstraints<'a, 'tcx> {
7891
Some(dot::LabelText::LabelStr(Cow::Borrowed("box")))
7992
}
8093
fn node_label(&'this self, n: &RegionVid) -> dot::LabelText<'this> {
81-
dot::LabelText::LabelStr(render_region_vid(*n, self.regioncx).into())
94+
dot::LabelText::LabelStr(render_region_vid(self.tcx, *n, self.regioncx).into())
8295
}
8396
fn edge_label(&'this self, e: &OutlivesConstraint<'tcx>) -> dot::LabelText<'this> {
8497
dot::LabelText::LabelStr(render_outlives_constraint(e).into())
@@ -110,6 +123,7 @@ impl<'a, 'this, 'tcx> dot::GraphWalk<'this> for RawConstraints<'a, 'tcx> {
110123
}
111124

112125
struct SccConstraints<'a, 'tcx> {
126+
tcx: TyCtxt<'tcx>,
113127
regioncx: &'a RegionInferenceContext<'tcx>,
114128
nodes_per_scc: IndexVec<ConstraintSccIndex, Vec<RegionVid>>,
115129
}
@@ -128,8 +142,10 @@ impl<'a, 'this, 'tcx> dot::Labeller<'this> for SccConstraints<'a, 'tcx> {
128142
Some(dot::LabelText::LabelStr(Cow::Borrowed("box")))
129143
}
130144
fn node_label(&'this self, n: &ConstraintSccIndex) -> dot::LabelText<'this> {
131-
let nodes_str =
132-
self.nodes_per_scc[*n].iter().map(|n| render_region_vid(*n, self.regioncx)).join(", ");
145+
let nodes_str = self.nodes_per_scc[*n]
146+
.iter()
147+
.map(|n| render_region_vid(self.tcx, *n, self.regioncx))
148+
.join(", ");
133149
dot::LabelText::LabelStr(format!("SCC({n}) = {{{nodes_str}}}", n = n.as_usize()).into())
134150
}
135151
}

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,11 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
786786
let region_ctxt_fn = || {
787787
let reg_info = match br.kind {
788788
ty::BoundRegionKind::Anon => sym::anon,
789-
ty::BoundRegionKind::Named(_, name) => name,
789+
ty::BoundRegionKind::Named(def_id) => tcx.item_name(def_id),
790790
ty::BoundRegionKind::ClosureEnv => sym::env,
791+
ty::BoundRegionKind::NamedAnon(_) => {
792+
bug!("only used for pretty printing")
793+
}
791794
};
792795

793796
RegionCtxt::LateBound(reg_info)

‎compiler/rustc_borrowck/src/type_check/relate_tys.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ use rustc_infer::infer::{InferCtxt, NllRegionVariableOrigin};
77
use rustc_infer::traits::Obligation;
88
use rustc_infer::traits::solve::Goal;
99
use rustc_middle::mir::ConstraintCategory;
10-
use rustc_middle::span_bug;
1110
use rustc_middle::traits::ObligationCause;
1211
use rustc_middle::traits::query::NoSolution;
1312
use rustc_middle::ty::relate::combine::{super_combine_consts, super_combine_tys};
1413
use rustc_middle::ty::{self, FnMutDelegate, Ty, TyCtxt, TypeVisitableExt};
14+
use rustc_middle::{bug, span_bug};
1515
use rustc_span::{Span, Symbol, sym};
1616
use tracing::{debug, instrument};
1717

@@ -215,7 +215,8 @@ impl<'a, 'b, 'tcx> NllTypeRelating<'a, 'b, 'tcx> {
215215
if let Some(ex_reg_var) = reg_map.get(&br) {
216216
*ex_reg_var
217217
} else {
218-
let ex_reg_var = self.next_existential_region_var(true, br.kind.get_name());
218+
let ex_reg_var =
219+
self.next_existential_region_var(true, br.kind.get_name(infcx.infcx.tcx));
219220
debug!(?ex_reg_var);
220221
reg_map.insert(br, ex_reg_var);
221222

@@ -263,8 +264,9 @@ impl<'a, 'b, 'tcx> NllTypeRelating<'a, 'b, 'tcx> {
263264

264265
let reg_info = match placeholder.bound.kind {
265266
ty::BoundRegionKind::Anon => sym::anon,
266-
ty::BoundRegionKind::Named(_, name) => name,
267+
ty::BoundRegionKind::Named(def_id) => self.type_checker.tcx().item_name(def_id),
267268
ty::BoundRegionKind::ClosureEnv => sym::env,
269+
ty::BoundRegionKind::NamedAnon(_) => bug!("only used for pretty printing"),
268270
};
269271

270272
if cfg!(debug_assertions) {

‎compiler/rustc_borrowck/src/universal_regions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
497497
|r| {
498498
debug!(?r);
499499
let region_vid = {
500-
let name = r.get_name_or_anon();
500+
let name = r.get_name_or_anon(self.infcx.tcx);
501501
self.infcx.next_nll_region_var(FR, || RegionCtxt::LateBound(name))
502502
};
503503

@@ -523,7 +523,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
523523
let kind = ty::LateParamRegionKind::from_bound(ty::BoundVar::from_usize(idx), kind);
524524
let r = ty::Region::new_late_param(self.infcx.tcx, self.mir_def.to_def_id(), kind);
525525
let region_vid = {
526-
let name = r.get_name_or_anon();
526+
let name = r.get_name_or_anon(self.infcx.tcx);
527527
self.infcx.next_nll_region_var(FR, || RegionCtxt::LateBound(name))
528528
};
529529

@@ -861,7 +861,7 @@ impl<'tcx> BorrowckInferCtxt<'tcx> {
861861
T: TypeFoldable<TyCtxt<'tcx>>,
862862
{
863863
fold_regions(self.infcx.tcx, value, |region, _depth| {
864-
let name = region.get_name_or_anon();
864+
let name = region.get_name_or_anon(self.infcx.tcx);
865865
debug!(?region, ?name);
866866

867867
self.next_nll_region_var(origin, || RegionCtxt::Free(name))

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ fn check_region_late_boundedness<'tcx>(
12391239
.unwrap_region_constraints()
12401240
.opportunistic_resolve_var(tcx, vid)
12411241
&& let ty::ReLateParam(ty::LateParamRegion {
1242-
kind: ty::LateParamRegionKind::Named(trait_param_def_id, _),
1242+
kind: ty::LateParamRegionKind::Named(trait_param_def_id),
12431243
..
12441244
}) = r.kind()
12451245
&& let ty::ReEarlyParam(ebr) = id_arg.expect_region().kind()
@@ -1264,7 +1264,7 @@ fn check_region_late_boundedness<'tcx>(
12641264
.unwrap_region_constraints()
12651265
.opportunistic_resolve_var(tcx, vid)
12661266
&& let ty::ReLateParam(ty::LateParamRegion {
1267-
kind: ty::LateParamRegionKind::Named(impl_param_def_id, _),
1267+
kind: ty::LateParamRegionKind::Named(impl_param_def_id),
12681268
..
12691269
}) = r.kind()
12701270
&& let ty::ReEarlyParam(ebr) = id_arg.expect_region().kind()
@@ -2468,7 +2468,7 @@ fn param_env_with_gat_bounds<'tcx>(
24682468
let normalize_impl_ty_args = ty::GenericArgs::identity_for_item(tcx, container_id)
24692469
.extend_to(tcx, impl_ty.def_id, |param, _| match param.kind {
24702470
GenericParamDefKind::Type { .. } => {
2471-
let kind = ty::BoundTyKind::Param(param.def_id, param.name);
2471+
let kind = ty::BoundTyKind::Param(param.def_id);
24722472
let bound_var = ty::BoundVariableKind::Ty(kind);
24732473
bound_vars.push(bound_var);
24742474
Ty::new_bound(
@@ -2479,7 +2479,7 @@ fn param_env_with_gat_bounds<'tcx>(
24792479
.into()
24802480
}
24812481
GenericParamDefKind::Lifetime => {
2482-
let kind = ty::BoundRegionKind::Named(param.def_id, param.name);
2482+
let kind = ty::BoundRegionKind::Named(param.def_id);
24832483
let bound_var = ty::BoundVariableKind::Region(kind);
24842484
bound_vars.push(bound_var);
24852485
ty::Region::new_bound(

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@ fn lint_redundant_lifetimes<'tcx>(
23382338
lifetimes.push(ty::Region::new_late_param(tcx, owner_id.to_def_id(), kind));
23392339
}
23402340
}
2341-
lifetimes.retain(|candidate| candidate.has_name());
2341+
lifetimes.retain(|candidate| candidate.is_named(tcx));
23422342

23432343
// Keep track of lifetimes which have already been replaced with other lifetimes.
23442344
// This makes sure that if `'a = 'b = 'c`, we don't say `'c` should be replaced by

‎compiler/rustc_hir_analysis/src/coherence/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ fn infringing_fields_error<'tcx>(
654654
.or_default()
655655
.push(origin.span());
656656
if let ty::RegionKind::ReEarlyParam(ebr) = b.kind()
657-
&& ebr.has_name()
657+
&& ebr.is_named()
658658
{
659659
bounds.push((b.to_string(), a.to_string(), None));
660660
}

‎compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -578,13 +578,7 @@ fn get_new_lifetime_name<'tcx>(
578578
let existing_lifetimes = tcx
579579
.collect_referenced_late_bound_regions(poly_trait_ref)
580580
.into_iter()
581-
.filter_map(|lt| {
582-
if let ty::BoundRegionKind::Named(_, name) = lt {
583-
Some(name.as_str().to_string())
584-
} else {
585-
None
586-
}
587-
})
581+
.filter_map(|lt| lt.get_name(tcx).map(|name| name.as_str().to_string()))
588582
.chain(generics.params.iter().filter_map(|param| {
589583
if let hir::GenericParamKind::Lifetime { .. } = &param.kind {
590584
Some(param.name.ident().as_str().to_string())

0 commit comments

Comments
 (0)