Skip to content

Commit 8e9dd83

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

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
@@ -1275,6 +1275,13 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
12751275
);
12761276
}
12771277

1278+
ty::CoroutineClosure(_, args) => {
1279+
// Transform async closures into function pointers
1280+
let fn_ptr = args.as_coroutine_closure().signature_parts_ty();
1281+
// Transform fn_sig inputs and output
1282+
ty = transform_ty(tcx, fn_ptr, options);
1283+
}
1284+
12781285
ty::Ref(region, ty0, ..) => {
12791286
// Remove references from function items, closures, and Fn trait objects
12801287
if ty0.is_fn_def() || ty0.is_closure() || is_dynamic_fn_trait(tcx, *ty0) {
@@ -1361,7 +1368,6 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
13611368

13621369
ty::Bound(..)
13631370
| ty::Error(..)
1364-
| ty::CoroutineClosure(..)
13651371
| ty::CoroutineWitness(..)
13661372
| ty::Infer(..)
13671373
| 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)