bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use input def_id to compute movable_coroutine

Browse source 
This previously incorrectly returned `true` for parent functions whose
first statement was `let local = <coroutine>;`. While that didn't cause
any bugs as we only ever access `movable_coroutine` for `yield`
terminators. It was still wrong.
This commit is contained in:
lcnr 2025-04-11 10:42:45 +02:00
parent 923f44c631
commit 8cb727424d
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_borrowck/src/lib.rs
View file

@ -374,17 +374,8 @@ fn do_mir_borrowck<'tcx>(
let diags_buffer = &mut BorrowckDiagnosticsBuffer::default();
nll::dump_annotation(&infcx, body, &regioncx, &opt_closure_req, diags_buffer);
let movable_coroutine =
// The first argument is the coroutine type passed by value
if let Some(local) = body.local_decls.raw.get(1)
// Get the interior types and args which typeck computed
&& let ty::Coroutine(def_id, _) = *local.ty.kind()
&& tcx.coroutine_movability(def_id) == hir::Movability::Movable
{
true
} else {
false
};
let movable_coroutine = body.coroutine.is_some()
&& tcx.coroutine_movability(def.to_def_id()) == hir::Movability::Movable;
// While promoteds should mostly be correct by construction, we need to check them for
// invalid moves to detect moving out of arrays:`struct S; fn main() { &([S][0]); }`.