Skip to content

Commit ae48c4c

Browse files
committed
CFI: Fix encode_ty: unexpected 'CoroutineWitness'
Fix rust-lang#122705 by adding support for encoding `ty:CoroutineClosure`.
1 parent 1b718bc commit ae48c4c

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,13 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
12781278
);
12791279
}
12801280

1281+
ty::CoroutineClosure(_, args) => {
1282+
// Transform async closures into function pointers
1283+
let fn_ptr = args.as_coroutine_closure().signature_parts_ty();
1284+
// Transform fn_sig inputs and output
1285+
ty = transform_ty(tcx, fn_ptr, options);
1286+
}
1287+
12811288
ty::Ref(region, ty0, ..) => {
12821289
// Remove references from function items, closures, and Fn trait objects
12831290
if ty0.is_fn_def() || ty0.is_closure() || is_dynamic_fn_trait(tcx, *ty0) {
@@ -1364,7 +1371,6 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
13641371

13651372
ty::Bound(..)
13661373
| ty::Error(..)
1367-
| ty::CoroutineClosure(..)
13681374
| ty::CoroutineWitness(..)
13691375
| ty::Infer(..)
13701376
| ty::Placeholder(..) => {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Verifies that using async closure works.
2+
//
3+
//@ needs-sanitizer-cfi
4+
//@ compile-flags: -Clto -Cprefer-dynamic=off -Ctarget-feature=-crt-static -Zsanitizer=cfi -Copt-level=0 --edition=2021
5+
//@ run-pass
6+
7+
#![feature(async_closure)]
8+
9+
#[inline(never)]
10+
fn foo<T>(_: T) {}
11+
12+
fn main() {
13+
let a = async move |_: i32, _: i32| {};
14+
foo(a);
15+
}

0 commit comments

Comments
 (0)