Skip to content

Commit 8a03147

Browse files
committed
Normalize MIR locals' types for generator layout computation.
1 parent 11f6096 commit 8a03147

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/librustc_mir/transform/generator.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -720,15 +720,18 @@ fn compute_layout<'tcx>(
720720
_ => bug!(),
721721
};
722722

723+
let param_env = tcx.param_env(source.def_id());
724+
723725
for (local, decl) in body.local_decls.iter_enumerated() {
724726
// Ignore locals which are internal or not live
725727
if !live_locals.contains(local) || decl.internal {
726728
continue;
727729
}
730+
let decl_ty = tcx.normalize_erasing_regions(param_env, decl.ty);
728731

729732
// Sanity check that typeck knows about the type of locals which are
730733
// live across a suspension point
731-
if !allowed.contains(&decl.ty) && !allowed_upvars.contains(&decl.ty) {
734+
if !allowed.contains(&decl_ty) && !allowed_upvars.contains(&decl_ty) {
732735
span_bug!(
733736
body.span,
734737
"Broken MIR: generator contains type {} in MIR, \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// check-pass
2+
// edition:2018
3+
// compile-flags: --crate-type=lib
4+
5+
pub async fn test() {
6+
const C: usize = 4;
7+
foo(&mut [0u8; C]).await;
8+
}
9+
10+
async fn foo(_: &mut [u8]) {}

0 commit comments

Comments
 (0)