Skip to content

Commit 74ac565

Browse files
bvanjoibvanjoi
committed
reduce the calls to tcx.is_coroutine 
1 parent 601a427 commit 74ac565

File tree

7 files changed

+98
-96
lines changed

7 files changed

+98
-96
lines changed

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

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,6 +1388,7 @@ fn opaque_type_cycle_error(
13881388
struct OpaqueTypeCollector {
13891389
opaques: Vec<DefId>,
13901390
closures: Vec<DefId>,
1391+
coroutine: Vec<DefId>,
13911392
}
13921393
impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector {
13931394
fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
@@ -1396,10 +1397,14 @@ fn opaque_type_cycle_error(
13961397
self.opaques.push(def);
13971398
ControlFlow::Continue(())
13981399
}
1399-
ty::Closure(def_id, ..) | ty::Coroutine(def_id, ..) => {
1400+
ty::Closure(def_id, ..) => {
14001401
self.closures.push(def_id);
14011402
t.super_visit_with(self)
14021403
}
1404+
ty::Coroutine(def_id, ..) => {
1405+
self.coroutine.push(def_id);
1406+
t.super_visit_with(self)
1407+
}
14031408
_ => t.super_visit_with(self),
14041409
}
14051410
}
@@ -1417,43 +1422,48 @@ fn opaque_type_cycle_error(
14171422
err.span_label(sp, format!("returning here with type `{ty}`"));
14181423
}
14191424

1420-
for closure_def_id in visitor.closures {
1421-
let Some(closure_local_did) = closure_def_id.as_local() else {
1422-
continue;
1423-
};
1424-
let typeck_results = tcx.typeck(closure_local_did);
1425-
1426-
let mut label_match = |ty: Ty<'_>, span| {
1427-
for arg in ty.walk() {
1428-
if let ty::GenericArgKind::Type(ty) = arg.unpack()
1429-
&& let ty::Alias(
1430-
ty::Opaque,
1431-
ty::AliasTy { def_id: captured_def_id, .. },
1432-
) = *ty.kind()
1433-
&& captured_def_id == opaque_def_id.to_def_id()
1434-
{
1435-
err.span_label(
1436-
span,
1437-
format!(
1438-
"{} captures itself here",
1439-
tcx.def_descr(closure_def_id)
1440-
),
1441-
);
1442-
}
1425+
let label_match = |err: &mut DiagnosticBuilder<'_, _>, ty: Ty<'_>, span, def_id| {
1426+
for arg in ty.walk() {
1427+
if let ty::GenericArgKind::Type(ty) = arg.unpack()
1428+
&& let ty::Alias(
1429+
ty::Opaque,
1430+
ty::AliasTy { def_id: captured_def_id, .. },
1431+
) = *ty.kind()
1432+
&& captured_def_id == opaque_def_id.to_def_id()
1433+
{
1434+
err.span_label(
1435+
span,
1436+
format!("{} captures itself here", tcx.def_descr(def_id)),
1437+
);
14431438
}
1444-
};
1439+
}
1440+
};
14451441

1442+
let capture = |err: &mut DiagnosticBuilder<'_, _>, def_id: DefId| {
1443+
let Some(local_id) = def_id.as_local() else {
1444+
return;
1445+
};
1446+
let typeck_results = tcx.typeck(local_id);
14461447
// Label any closure upvars that capture the opaque
1447-
for capture in typeck_results.closure_min_captures_flattened(closure_local_did)
1448-
{
1449-
label_match(capture.place.ty(), capture.get_path_span(tcx));
1448+
for capture in typeck_results.closure_min_captures_flattened(local_id) {
1449+
label_match(err, capture.place.ty(), capture.get_path_span(tcx), def_id);
14501450
}
1451-
// Label any coroutine locals that capture the opaque
1452-
if tcx.is_coroutine(closure_def_id)
1453-
&& let Some(coroutine_layout) = tcx.mir_coroutine_witnesses(closure_def_id)
1454-
{
1451+
};
1452+
1453+
for closure_def_id in visitor.closures {
1454+
capture(&mut err, closure_def_id);
1455+
}
1456+
1457+
for coroutine_def_id in visitor.coroutine {
1458+
capture(&mut err, coroutine_def_id);
1459+
if let Some(coroutine_layout) = tcx.mir_coroutine_witnesses(coroutine_def_id) {
14551460
for interior_ty in &coroutine_layout.field_tys {
1456-
label_match(interior_ty.ty, interior_ty.source_info.span);
1461+
label_match(
1462+
&mut err,
1463+
interior_ty.ty,
1464+
interior_ty.source_info.span,
1465+
coroutine_def_id,
1466+
);
14571467
}
14581468
}
14591469
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,6 +1617,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16171617
for (def_id, encode_const, encode_opt) in keys_and_jobs {
16181618
debug_assert!(encode_const || encode_opt);
16191619

1620+
let def_kind = tcx.def_kind(def_id);
1621+
16201622
debug!("EntryBuilder::encode_mir({:?})", def_id);
16211623
if encode_opt {
16221624
record!(self.tables.optimized_mir[def_id.to_def_id()] <- tcx.optimized_mir(def_id));
@@ -1626,7 +1628,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16261628
record!(self.tables.closure_saved_names_of_captured_variables[def_id.to_def_id()]
16271629
<- tcx.closure_saved_names_of_captured_variables(def_id));
16281630

1629-
if self.tcx.is_coroutine(def_id.to_def_id())
1631+
if DefKind::Closure == def_kind
1632+
&& tcx.is_coroutine(def_id.to_def_id())
16301633
&& let Some(witnesses) = tcx.mir_coroutine_witnesses(def_id)
16311634
{
16321635
record!(self.tables.mir_coroutine_witnesses[def_id.to_def_id()] <- witnesses);
@@ -1653,7 +1656,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16531656
}
16541657
record!(self.tables.promoted_mir[def_id.to_def_id()] <- tcx.promoted_mir(def_id));
16551658

1656-
if self.tcx.is_coroutine(def_id.to_def_id())
1659+
if DefKind::Closure == def_kind
1660+
&& tcx.is_coroutine(def_id.to_def_id())
16571661
&& let Some(witnesses) = tcx.mir_coroutine_witnesses(def_id)
16581662
{
16591663
record!(self.tables.mir_coroutine_witnesses[def_id.to_def_id()] <- witnesses);

‎compiler/rustc_mir_build/src/build/mod.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -638,25 +638,25 @@ fn construct_error(tcx: TyCtxt<'_>, def_id: LocalDefId, guar: ErrorGuaranteed) -
638638
);
639639
(sig.inputs().to_vec(), sig.output(), None)
640640
}
641-
DefKind::Closure if coroutine_kind.is_some() => {
642-
let coroutine_ty = tcx.type_of(def_id).instantiate_identity();
643-
let ty::Coroutine(_, args, _) = coroutine_ty.kind() else { bug!() };
644-
let args = args.as_coroutine();
645-
let yield_ty = args.yield_ty();
646-
let return_ty = args.return_ty();
647-
(vec![coroutine_ty, args.resume_ty()], return_ty, Some(yield_ty))
648-
}
649641
DefKind::Closure => {
650-
let closure_ty = tcx.type_of(def_id).instantiate_identity();
651-
let ty::Closure(_, args) = closure_ty.kind() else { bug!() };
652-
let args = args.as_closure();
653-
let sig = tcx.liberate_late_bound_regions(def_id.to_def_id(), args.sig());
654-
let self_ty = match args.kind() {
655-
ty::ClosureKind::Fn => Ty::new_imm_ref(tcx, tcx.lifetimes.re_erased, closure_ty),
656-
ty::ClosureKind::FnMut => Ty::new_mut_ref(tcx, tcx.lifetimes.re_erased, closure_ty),
657-
ty::ClosureKind::FnOnce => closure_ty,
658-
};
659-
([self_ty].into_iter().chain(sig.inputs().to_vec()).collect(), sig.output(), None)
642+
let ty = tcx.type_of(def_id).instantiate_identity();
643+
if let ty::Coroutine(_, args, _) = ty.kind() {
644+
let args = args.as_coroutine();
645+
let yield_ty = args.yield_ty();
646+
let return_ty = args.return_ty();
647+
(vec![ty, args.resume_ty()], return_ty, Some(yield_ty))
648+
} else if let ty::Closure(_, args) = ty.kind() {
649+
let args = args.as_closure();
650+
let sig = tcx.liberate_late_bound_regions(def_id.to_def_id(), args.sig());
651+
let self_ty = match args.kind() {
652+
ty::ClosureKind::Fn => Ty::new_imm_ref(tcx, tcx.lifetimes.re_erased, ty),
653+
ty::ClosureKind::FnMut => Ty::new_mut_ref(tcx, tcx.lifetimes.re_erased, ty),
654+
ty::ClosureKind::FnOnce => ty,
655+
};
656+
([self_ty].into_iter().chain(sig.inputs().to_vec()).collect(), sig.output(), None)
657+
} else {
658+
bug!()
659+
}
660660
}
661661
dk => bug!("{:?} is not a body: {:?}", def_id, dk),
662662
};

‎compiler/rustc_mir_build/src/thir/cx/mod.rs‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ pub(crate) fn thir_body(
3737

3838
// The resume argument may be missing, in that case we need to provide it here.
3939
// It will always be `()` in this case.
40-
if tcx.is_coroutine(owner_def.to_def_id()) && body.params.is_empty() {
40+
if body.params.is_empty()
41+
&& tcx.def_kind(owner_def) == DefKind::Closure
42+
&& tcx.is_coroutine(owner_def.to_def_id())
43+
{
4144
cx.thir.params.push(Param {
4245
ty: Ty::new_unit(tcx),
4346
pat: None,
@@ -119,45 +122,30 @@ impl<'tcx> Cx<'tcx> {
119122

120123
fn closure_env_param(&self, owner_def: LocalDefId, owner_id: HirId) -> Option<Param<'tcx>> {
121124
match self.tcx.def_kind(owner_def) {
122-
DefKind::Closure if self.tcx.is_coroutine(owner_def.to_def_id()) => {
123-
let coroutine_ty = self.typeck_results.node_type(owner_id);
124-
let coroutine_param = Param {
125-
ty: coroutine_ty,
126-
pat: None,
127-
ty_span: None,
128-
self_kind: None,
129-
hir_id: None,
130-
};
131-
Some(coroutine_param)
132-
}
133125
DefKind::Closure => {
134-
let closure_ty = self.typeck_results.node_type(owner_id);
135-
136-
let ty::Closure(closure_def_id, closure_args) = *closure_ty.kind() else {
137-
bug!("closure expr does not have closure type: {:?}", closure_ty);
126+
let ty = self.typeck_results.node_type(owner_id);
127+
let ty = if ty.is_coroutine() {
128+
ty
129+
} else if let ty::Closure(closure_def_id, closure_args) = *ty.kind() {
130+
let bound_vars = self
131+
.tcx
132+
.mk_bound_variable_kinds(&[ty::BoundVariableKind::Region(ty::BrEnv)]);
133+
let br = ty::BoundRegion {
134+
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
135+
kind: ty::BrEnv,
136+
};
137+
let env_region = ty::Region::new_bound(self.tcx, ty::INNERMOST, br);
138+
let closure_env_ty =
139+
self.tcx.closure_env_ty(closure_def_id, closure_args, env_region).unwrap();
140+
self.tcx.instantiate_bound_regions_with_erased(ty::Binder::bind_with_vars(
141+
closure_env_ty,
142+
bound_vars,
143+
))
144+
} else {
145+
bug!("closure expr does not have closure type: {:?}", ty);
138146
};
139-
140-
let bound_vars =
141-
self.tcx.mk_bound_variable_kinds(&[ty::BoundVariableKind::Region(ty::BrEnv)]);
142-
let br = ty::BoundRegion {
143-
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
144-
kind: ty::BrEnv,
145-
};
146-
let env_region = ty::Region::new_bound(self.tcx, ty::INNERMOST, br);
147-
let closure_env_ty =
148-
self.tcx.closure_env_ty(closure_def_id, closure_args, env_region).unwrap();
149-
let liberated_closure_env_ty = self.tcx.instantiate_bound_regions_with_erased(
150-
ty::Binder::bind_with_vars(closure_env_ty, bound_vars),
151-
);
152-
let env_param = Param {
153-
ty: liberated_closure_env_ty,
154-
pat: None,
155-
ty_span: None,
156-
self_kind: None,
157-
hir_id: None,
158-
};
159-
160-
Some(env_param)
147+
let param = Param { ty, pat: None, ty_span: None, self_kind: None, hir_id: None };
148+
Some(param)
161149
}
162150
_ => None,
163151
}

‎compiler/rustc_mir_transform/src/const_prop.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'tcx> MirPass<'tcx> for ConstProp {
8484

8585
// FIXME(welseywiser) const prop doesn't work on coroutines because of query cycles
8686
// computing their layout.
87-
if tcx.is_coroutine(def_id.to_def_id()) {
87+
if def_kind == DefKind::Closure && tcx.is_coroutine(def_id.to_def_id()) {
8888
trace!("ConstProp skipped for coroutine {:?}", def_id);
8989
return;
9090
}

‎compiler/rustc_mir_transform/src/const_prop_lint.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'tcx> MirLint<'tcx> for ConstPropLint {
6161

6262
// FIXME(welseywiser) const prop doesn't work on coroutines because of query cycles
6363
// computing their layout.
64-
if tcx.is_coroutine(def_id.to_def_id()) {
64+
if def_kind == DefKind::Closure && tcx.is_coroutine(def_id.to_def_id()) {
6565
trace!("ConstPropLint skipped for coroutine {:?}", def_id);
6666
return;
6767
}

‎compiler/rustc_mir_transform/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,13 @@ fn inner_mir_for_ctfe(tcx: TyCtxt<'_>, def: LocalDefId) -> Body<'_> {
395395
/// mir borrowck *before* doing so in order to ensure that borrowck can be run and doesn't
396396
/// end up missing the source MIR due to stealing happening.
397397
fn mir_drops_elaborated_and_const_checked(tcx: TyCtxt<'_>, def: LocalDefId) -> &Steal<Body<'_>> {
398-
if tcx.is_coroutine(def.to_def_id()) {
398+
let def_kind = tcx.def_kind(def);
399+
if def_kind == DefKind::Closure && tcx.is_coroutine(def.to_def_id()) {
399400
tcx.ensure_with_value().mir_coroutine_witnesses(def);
400401
}
401402
let mir_borrowck = tcx.mir_borrowck(def);
402403

403-
let is_fn_like = tcx.def_kind(def).is_fn_like();
404-
if is_fn_like {
404+
if def_kind.is_fn_like() {
405405
// Do not compute the mir call graph without said call graph actually being used.
406406
if pm::should_run_pass(tcx, &inline::Inline) {
407407
tcx.ensure_with_value().mir_inliner_callees(ty::InstanceDef::Item(def.to_def_id()));

0 commit comments

Comments
 (0)