bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix ABI for FnMut/Fn impls for async closures

Browse source
This commit is contained in:
Michael Goulet 2024-02-28 20:25:25 +00:00
parent 05116c5c30
commit f1fef64e19
12 changed files with 81 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_ty_utils/src/abi.rs
View file

@ -118,11 +118,18 @@ fn fn_sig_for_fn_abi<'tcx>(
// a separate def-id for these bodies.
let mut coroutine_kind = args.as_coroutine_closure().kind();
if let InstanceDef::ConstructCoroutineInClosureShim { .. } = instance.def {
coroutine_kind = ty::ClosureKind::FnOnce;
}
let env_ty =
if let InstanceDef::ConstructCoroutineInClosureShim { receiver_by_ref, .. } =
instance.def
{
coroutine_kind = ty::ClosureKind::FnOnce;
let env_ty = tcx.closure_env_ty(coroutine_ty, coroutine_kind, env_region);
// Implementations of `FnMut` and `Fn` for coroutine-closures
// still take their receiver by ref.
if receiver_by_ref { Ty::new_mut_ptr(tcx, coroutine_ty) } else { coroutine_ty }
} else {
tcx.closure_env_ty(coroutine_ty, coroutine_kind, env_region)
};
let sig = sig.skip_binder();
ty::Binder::bind_with_vars(

2
compiler/rustc_ty_utils/src/instance.rs
View file

@ -282,6 +282,7 @@ fn resolve_associated_item<'tcx>(
Some(Instance {
def: ty::InstanceDef::ConstructCoroutineInClosureShim {
coroutine_closure_def_id,
receiver_by_ref: target_kind != ty::ClosureKind::FnOnce,
},
args,
})
@ -304,6 +305,7 @@ fn resolve_associated_item<'tcx>(
Some(Instance {
def: ty::InstanceDef::ConstructCoroutineInClosureShim {
coroutine_closure_def_id,
receiver_by_ref: false,
},
args,
})