mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #119322 - compiler-errors:async-gen-resume-ty, r=cjgillot

Browse Source 
Couple of random coroutine pass simplifications

Just aesthetic changes, except for a random `Ty::new_task_context(tcx)` call that was redundant.
This commit is contained in:
Matthias Krüger 2023-12-29 21:40:22 +01:00 committed by GitHub
commit b75ba15062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/rustc_mir_transform/src/coroutine.rs
View File

@ -1417,20 +1417,18 @@ fn create_coroutine_resume_function<'tcx>(
cases.insert(0, (UNRESUMED, START_BLOCK)); cases.insert(0, (UNRESUMED, START_BLOCK));
// Panic when resumed on the returned or poisoned state // Panic when resumed on the returned or poisoned state
let coroutine_kind = body.coroutine_kind().unwrap();
if can_unwind { if can_unwind {
cases.insert( cases.insert(
1, 1,
(POISONED, insert_panic_block(tcx, body, ResumedAfterPanic(coroutine_kind))), (POISONED, insert_panic_block(tcx, body, ResumedAfterPanic(transform.coroutine_kind))),
); );
} }
if can_return { if can_return {
let block = match coroutine_kind { let block = match transform.coroutine_kind {
CoroutineKind::Desugared(CoroutineDesugaring::Async, _) CoroutineKind::Desugared(CoroutineDesugaring::Async, _)
| CoroutineKind::Coroutine(_) => { | CoroutineKind::Coroutine(_) => {
insert_panic_block(tcx, body, ResumedAfterReturn(coroutine_kind)) insert_panic_block(tcx, body, ResumedAfterReturn(transform.coroutine_kind))
} }
CoroutineKind::Desugared(CoroutineDesugaring::AsyncGen, _) CoroutineKind::Desugared(CoroutineDesugaring::AsyncGen, _)
| CoroutineKind::Desugared(CoroutineDesugaring::Gen, _) => { | CoroutineKind::Desugared(CoroutineDesugaring::Gen, _) => {
@ -1444,7 +1442,7 @@ fn create_coroutine_resume_function<'tcx>(
make_coroutine_state_argument_indirect(tcx, body); make_coroutine_state_argument_indirect(tcx, body);
match coroutine_kind { match transform.coroutine_kind {
// Iterator::next doesn't accept a pinned argument, // Iterator::next doesn't accept a pinned argument,
// unlike for all other coroutine kinds. // unlike for all other coroutine kinds.
CoroutineKind::Desugared(CoroutineDesugaring::Gen, _) => {} CoroutineKind::Desugared(CoroutineDesugaring::Gen, _) => {}
@ -1614,12 +1612,6 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
} }
}; };
let is_async_kind =
matches!(coroutine_kind, CoroutineKind::Desugared(CoroutineDesugaring::Async, _));
let is_async_gen_kind =
matches!(coroutine_kind, CoroutineKind::Desugared(CoroutineDesugaring::AsyncGen, _));
let is_gen_kind =
matches!(coroutine_kind, CoroutineKind::Desugared(CoroutineDesugaring::Gen, _));
let new_ret_ty = match coroutine_kind { let new_ret_ty = match coroutine_kind {
CoroutineKind::Desugared(CoroutineDesugaring::Async, _) => { CoroutineKind::Desugared(CoroutineDesugaring::Async, _) => {
// Compute Poll<return_ty> // Compute Poll<return_ty>
@ -1653,7 +1645,10 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
let old_ret_local = replace_local(RETURN_PLACE, new_ret_ty, body, tcx); let old_ret_local = replace_local(RETURN_PLACE, new_ret_ty, body, tcx);
// Replace all occurrences of `ResumeTy` with `&mut Context<'_>` within async bodies. // Replace all occurrences of `ResumeTy` with `&mut Context<'_>` within async bodies.
if is_async_kind || is_async_gen_kind { if matches!(
coroutine_kind,
CoroutineKind::Desugared(CoroutineDesugaring::Async | CoroutineDesugaring::AsyncGen, _)
) {
transform_async_context(tcx, body); transform_async_context(tcx, body);
} }
@ -1662,11 +1657,7 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
// case there is no `Assign` to it that the transform can turn into a store to the coroutine // case there is no `Assign` to it that the transform can turn into a store to the coroutine
// state. After the yield the slot in the coroutine state would then be uninitialized. // state. After the yield the slot in the coroutine state would then be uninitialized.
let resume_local = Local::new(2); let resume_local = Local::new(2);
let resume_ty = if is_async_kind { let resume_ty = body.local_decls[resume_local].ty;
Ty::new_task_context(tcx)
} else {
body.local_decls[resume_local].ty
};
let old_resume_local = replace_local(resume_local, resume_ty, body, tcx); let old_resume_local = replace_local(resume_local, resume_ty, body, tcx);
// When first entering the coroutine, move the resume argument into its old local // When first entering the coroutine, move the resume argument into its old local
@ -1709,11 +1700,11 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
// Run the transformation which converts Places from Local to coroutine struct // Run the transformation which converts Places from Local to coroutine struct
// accesses for locals in `remap`. // accesses for locals in `remap`.
// It also rewrites `return x` and `yield y` as writing a new coroutine state and returning // It also rewrites `return x` and `yield y` as writing a new coroutine state and returning
// either CoroutineState::Complete(x) and CoroutineState::Yielded(y), // either `CoroutineState::Complete(x)` and `CoroutineState::Yielded(y)`,
// or Poll::Ready(x) and Poll::Pending respectively depending on `is_async_kind`. // or `Poll::Ready(x)` and `Poll::Pending` respectively depending on the coroutine kind.
let mut transform = TransformVisitor { let mut transform = TransformVisitor {
tcx, tcx,
coroutine_kind: body.coroutine_kind().unwrap(), coroutine_kind,
remap, remap,
storage_liveness, storage_liveness,
always_live_locals, always_live_locals,
@ -1730,7 +1721,7 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
body.spread_arg = None; body.spread_arg = None;
// Remove the context argument within generator bodies. // Remove the context argument within generator bodies.
if is_gen_kind { if matches!(coroutine_kind, CoroutineKind::Desugared(CoroutineDesugaring::Gen, _)) {
transform_gen_context(tcx, body); transform_gen_context(tcx, body);
} }