Skip to content

Commit 67669d4

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

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
@@ -1285,6 +1285,13 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
12851285
ty = transform_ty(tcx, fn_ptr, options);
12861286
}
12871287

1288+
ty::CoroutineClosure(_, args) => {
1289+
// Transform async closures into function pointers
1290+
let fn_ptr = args.as_coroutine_closure().signature_parts_ty();
1291+
// Transform fn_sig inputs and output
1292+
ty = transform_ty(tcx, fn_ptr, options);
1293+
}
1294+
12881295
ty::Ref(region, ty0, ..) => {
12891296
// Remove references from function items, closures, and Fn trait objects
12901297
if ty0.is_fn_def() || ty0.is_closure() || is_dynamic_fn_trait(tcx, *ty0) {
@@ -1371,7 +1378,6 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
13711378

13721379
ty::Bound(..)
13731380
| ty::Error(..)
1374-
| ty::CoroutineClosure(..)
13751381
| ty::CoroutineWitness(..)
13761382
| ty::Infer(..)
13771383
| 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)