Skip to content

Commit 06e4292

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#119444
Rollup merge of rust-lang#119444 - compiler-errors:closure-or-coroutine, r=oli-obk Rename `TyCtxt::is_closure` to `TyCtxt::is_closure_or_coroutine` This function has always been used to test whether the def-id was a closure **or** coroutine: https://github.com/rust-lang/rust/pull/118311/files#diff-69ebec59f7d38331dd1be84ede7957977dcaa39e30ed2869b04aa8c99b2079ccR552 -- the name is just confusing because it disagrees with other fns named `is_closure`, like `Ty::is_closure`. So let's rename it.
2 parents 1a47f5b + 847cd6c commit 06e4292

File tree

15 files changed

+32
-27
lines changed

15 files changed

+32
-27
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3067,7 +3067,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
30673067
) -> Option<AnnotatedBorrowFnSignature<'tcx>> {
30683068
// Define a fallback for when we can't match a closure.
30693069
let fallback = || {
3070-
let is_closure = self.infcx.tcx.is_closure(self.mir_def_id().to_def_id());
3070+
let is_closure = self.infcx.tcx.is_closure_or_coroutine(self.mir_def_id().to_def_id());
30713071
if is_closure {
30723072
None
30733073
} else {
@@ -3277,7 +3277,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
32773277
sig: ty::PolyFnSig<'tcx>,
32783278
) -> Option<AnnotatedBorrowFnSignature<'tcx>> {
32793279
debug!("annotate_fn_sig: did={:?} sig={:?}", did, sig);
3280-
let is_closure = self.infcx.tcx.is_closure(did.to_def_id());
3280+
let is_closure = self.infcx.tcx.is_closure_or_coroutine(did.to_def_id());
32813281
let fn_hir_id = self.infcx.tcx.local_def_id_to_hir_id(did);
32823282
let fn_decl = self.infcx.tcx.hir().fn_decl_by_hir_id(fn_hir_id)?;
32833283

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
2222
#[instrument(skip(self, body), level = "debug")]
2323
pub(super) fn check_signature_annotation(&mut self, body: &Body<'tcx>) {
2424
let mir_def_id = body.source.def_id().expect_local();
25-
if !self.tcx().is_closure(mir_def_id.to_def_id()) {
25+
if !self.tcx().is_closure_or_coroutine(mir_def_id.to_def_id()) {
2626
return;
2727
}
2828
let user_provided_poly_sig = self.tcx().closure_user_provided_sig(mir_def_id);

‎compiler/rustc_codegen_llvm/src/attributes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ pub fn from_fn_attrs<'ll, 'tcx>(
481481
// `+multivalue` feature because the purpose of the wasm abi is to match
482482
// the WebAssembly specification, which has this feature. This won't be
483483
// needed when LLVM enables this `multivalue` feature by default.
484-
if !cx.tcx.is_closure(instance.def_id()) {
484+
if !cx.tcx.is_closure_or_coroutine(instance.def_id()) {
485485
let abi = cx.tcx.fn_sig(instance.def_id()).skip_binder().abi();
486486
if abi == Abi::Wasm {
487487
function_features.push("+multivalue".to_string());

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
232232
}
233233
sym::thread_local => codegen_fn_attrs.flags |= CodegenFnAttrFlags::THREAD_LOCAL,
234234
sym::track_caller => {
235-
let is_closure = tcx.is_closure(did.to_def_id());
235+
let is_closure = tcx.is_closure_or_coroutine(did.to_def_id());
236236

237237
if !is_closure
238238
&& let Some(fn_sig) = fn_sig()
@@ -277,7 +277,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
277277
}
278278
}
279279
sym::target_feature => {
280-
if !tcx.is_closure(did.to_def_id())
280+
if !tcx.is_closure_or_coroutine(did.to_def_id())
281281
&& let Some(fn_sig) = fn_sig()
282282
&& fn_sig.skip_binder().unsafety() == hir::Unsafety::Normal
283283
{
@@ -531,7 +531,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
531531
// would result in this closure being compiled without the inherited target features, but this
532532
// is probably a poor usage of `#[inline(always)]` and easily avoided by not using the attribute.
533533
if tcx.features().target_feature_11
534-
&& tcx.is_closure(did.to_def_id())
534+
&& tcx.is_closure_or_coroutine(did.to_def_id())
535535
&& codegen_fn_attrs.inline != InlineAttr::Always
536536
{
537537
let owner_id = tcx.parent(did.to_def_id());

‎compiler/rustc_const_eval/src/transform/check_consts/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'mir, 'tcx> ConstCx<'mir, 'tcx> {
7272

7373
pub fn fn_sig(&self) -> PolyFnSig<'tcx> {
7474
let did = self.def_id().to_def_id();
75-
if self.tcx.is_closure(did) {
75+
if self.tcx.is_closure_or_coroutine(did) {
7676
let ty = self.tcx.type_of(did).instantiate_identity();
7777
let ty::Closure(_, args) = ty.kind() else { bug!("type_of closure not ty::Closure") };
7878
args.as_closure().sig()

‎compiler/rustc_hir_typeck/src/check.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ pub(super) fn check_fn<'a, 'tcx>(
125125
// ty_span == binding_span iff this is a closure parameter with no type ascription,
126126
// or if it's an implicit `self` parameter
127127
traits::SizedArgumentType(
128-
if ty_span == Some(param.span) && tcx.is_closure(fn_def_id.into()) {
128+
if ty_span == Some(param.span) && tcx.is_closure_or_coroutine(fn_def_id.into())
129+
{
129130
None
130131
} else {
131132
ty_span

‎compiler/rustc_hir_typeck/src/gather_locals.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl<'a, 'tcx> Visitor<'tcx> for GatherLocalsVisitor<'a, 'tcx> {
150150
// ascription, or if it's an implicit `self` parameter
151151
traits::SizedArgumentType(
152152
if ty_span == ident.span
153-
&& self.fcx.tcx.is_closure(self.fcx.body_id.into())
153+
&& self.fcx.tcx.is_closure_or_coroutine(self.fcx.body_id.into())
154154
{
155155
None
156156
} else {

‎compiler/rustc_middle/src/mir/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ fn write_mir_sig(tcx: TyCtxt<'_>, body: &Body<'_>, w: &mut dyn io::Write) -> io:
520520
let kind = tcx.def_kind(def_id);
521521
let is_function = match kind {
522522
DefKind::Fn | DefKind::AssocFn | DefKind::Ctor(..) => true,
523-
_ => tcx.is_closure(def_id),
523+
_ => tcx.is_closure_or_coroutine(def_id),
524524
};
525525
match (kind, body.source.promoted) {
526526
(_, Some(i)) => write!(w, "{i:?} in ")?,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ pub struct ClosureTypeInfo<'tcx> {
197197
}
198198

199199
fn closure_typeinfo<'tcx>(tcx: TyCtxt<'tcx>, def: LocalDefId) -> ClosureTypeInfo<'tcx> {
200-
debug_assert!(tcx.is_closure(def.to_def_id()));
200+
debug_assert!(tcx.is_closure_or_coroutine(def.to_def_id()));
201201
let typeck_results = tcx.typeck(def);
202202
let user_provided_sig = typeck_results.user_provided_sigs[&def];
203203
let captures = typeck_results.closure_min_captures_flattened(def);
@@ -217,7 +217,7 @@ impl<'tcx> TyCtxt<'tcx> {
217217
}
218218

219219
pub fn closure_captures(self, def_id: LocalDefId) -> &'tcx [&'tcx ty::CapturedPlace<'tcx>] {
220-
if !self.is_closure(def_id.to_def_id()) {
220+
if !self.is_closure_or_coroutine(def_id.to_def_id()) {
221221
return &[];
222222
};
223223
self.closure_typeinfo(def_id).captures

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

+9-8
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,10 @@ impl<'tcx> Instance<'tcx> {
426426
) -> Option<Instance<'tcx>> {
427427
debug!("resolve(def_id={:?}, args={:?})", def_id, args);
428428
// Use either `resolve_closure` or `resolve_for_vtable`
429-
assert!(!tcx.is_closure(def_id), "Called `resolve_for_fn_ptr` on closure: {def_id:?}");
429+
assert!(
430+
!tcx.is_closure_or_coroutine(def_id),
431+
"Called `resolve_for_fn_ptr` on closure: {def_id:?}"
432+
);
430433
Instance::resolve(tcx, param_env, def_id, args).ok().flatten().map(|mut resolved| {
431434
match resolved.def {
432435
InstanceDef::Item(def) if resolved.def.requires_caller_location(tcx) => {
@@ -488,7 +491,7 @@ impl<'tcx> Instance<'tcx> {
488491
})
489492
)
490493
{
491-
if tcx.is_closure(def) {
494+
if tcx.is_closure_or_coroutine(def) {
492495
debug!(" => vtable fn pointer created for closure with #[track_caller]: {:?} for method {:?} {:?}",
493496
def, def_id, args);
494497

@@ -658,12 +661,10 @@ fn polymorphize<'tcx>(
658661
// the unpolymorphized upvar closure would result in a polymorphized closure producing
659662
// multiple mono items (and eventually symbol clashes).
660663
let def_id = instance.def_id();
661-
let upvars_ty = if tcx.is_closure(def_id) {
662-
Some(args.as_closure().tupled_upvars_ty())
663-
} else if tcx.type_of(def_id).skip_binder().is_coroutine() {
664-
Some(args.as_coroutine().tupled_upvars_ty())
665-
} else {
666-
None
664+
let upvars_ty = match tcx.type_of(def_id).skip_binder().kind() {
665+
ty::Closure(..) => Some(args.as_closure().tupled_upvars_ty()),
666+
ty::Coroutine(..) => Some(args.as_coroutine().tupled_upvars_ty()),
667+
_ => None,
667668
};
668669
let has_upvars = upvars_ty.is_some_and(|ty| !ty.tuple_fields().is_empty());
669670
debug!("polymorphize: upvars_ty={:?} has_upvars={:?}", upvars_ty, has_upvars);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl<'tcx> TyCtxt<'tcx> {
547547
/// closure appears (and, sadly, a corresponding `NodeId`, since
548548
/// those are not yet phased out). The parent of the closure's
549549
/// `DefId` will also be the context where it appears.
550-
pub fn is_closure(self, def_id: DefId) -> bool {
550+
pub fn is_closure_or_coroutine(self, def_id: DefId) -> bool {
551551
matches!(self.def_kind(def_id), DefKind::Closure)
552552
}
553553

‎compiler/rustc_mir_transform/src/coverage/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ fn get_body_span<'tcx>(
359359
) -> Span {
360360
let mut body_span = hir_body.value.span;
361361

362-
if tcx.is_closure(def_id.to_def_id()) {
362+
if tcx.is_closure_or_coroutine(def_id.to_def_id()) {
363363
// If the current function is a closure, and its "body" span was created
364364
// by macro expansion or compiler desugaring, try to walk backwards to
365365
// the pre-expansion call site or body.

‎compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn bcb_to_initial_coverage_spans<'a, 'tcx>(
7474
let expn_span = filtered_statement_span(statement)?;
7575
let span = unexpand_into_body_span(expn_span, body_span)?;
7676

77-
Some(CoverageSpan::new(span, expn_span, bcb, is_closure(statement)))
77+
Some(CoverageSpan::new(span, expn_span, bcb, is_closure_or_coroutine(statement)))
7878
});
7979

8080
let terminator_span = Some(data.terminator()).into_iter().filter_map(move |terminator| {
@@ -88,7 +88,7 @@ fn bcb_to_initial_coverage_spans<'a, 'tcx>(
8888
})
8989
}
9090

91-
fn is_closure(statement: &Statement<'_>) -> bool {
91+
fn is_closure_or_coroutine(statement: &Statement<'_>) -> bool {
9292
match statement.kind {
9393
StatementKind::Assign(box (_, Rvalue::Aggregate(box ref agg_kind, _))) => match agg_kind {
9494
AggregateKind::Closure(_, _) | AggregateKind::Coroutine(_, _) => true,

‎compiler/rustc_monomorphize/src/collector.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,10 @@ fn create_fn_mono_item<'tcx>(
11191119
source: Span,
11201120
) -> Spanned<MonoItem<'tcx>> {
11211121
let def_id = instance.def_id();
1122-
if tcx.sess.opts.unstable_opts.profile_closures && def_id.is_local() && tcx.is_closure(def_id) {
1122+
if tcx.sess.opts.unstable_opts.profile_closures
1123+
&& def_id.is_local()
1124+
&& tcx.is_closure_or_coroutine(def_id)
1125+
{
11231126
crate::util::dump_closure_profile(tcx, instance);
11241127
}
11251128

‎compiler/rustc_passes/src/upvars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_span::Span;
1111

1212
pub fn provide(providers: &mut Providers) {
1313
providers.upvars_mentioned = |tcx, def_id| {
14-
if !tcx.is_closure(def_id) {
14+
if !tcx.is_closure_or_coroutine(def_id) {
1515
return None;
1616
}
1717

0 commit comments

Comments
 (0)