Always use tcx.coroutine_layout over calling optimized_mir directly
This commit is contained in:
parent
0824b300eb
commit
847fd88df7
3 changed files with 3 additions and 4 deletions
|
@ -683,7 +683,7 @@ fn build_union_fields_for_direct_tag_coroutine<'ll, 'tcx>(
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let coroutine_layout = cx.tcx.optimized_mir(coroutine_def_id).coroutine_layout().unwrap();
|
let coroutine_layout = cx.tcx.coroutine_layout(coroutine_def_id).unwrap();
|
||||||
|
|
||||||
let common_upvar_names = cx.tcx.closure_saved_names_of_captured_variables(coroutine_def_id);
|
let common_upvar_names = cx.tcx.closure_saved_names_of_captured_variables(coroutine_def_id);
|
||||||
let variant_range = coroutine_args.variant_range(coroutine_def_id, cx.tcx);
|
let variant_range = coroutine_args.variant_range(coroutine_def_id, cx.tcx);
|
||||||
|
|
|
@ -158,8 +158,7 @@ pub(super) fn build_coroutine_di_node<'ll, 'tcx>(
|
||||||
DIFlags::FlagZero,
|
DIFlags::FlagZero,
|
||||||
),
|
),
|
||||||
|cx, coroutine_type_di_node| {
|
|cx, coroutine_type_di_node| {
|
||||||
let coroutine_layout =
|
let coroutine_layout = cx.tcx.coroutine_layout(coroutine_def_id).unwrap();
|
||||||
cx.tcx.optimized_mir(coroutine_def_id).coroutine_layout().unwrap();
|
|
||||||
|
|
||||||
let Variants::Multiple { tag_encoding: TagEncoding::Direct, ref variants, .. } =
|
let Variants::Multiple { tag_encoding: TagEncoding::Direct, ref variants, .. } =
|
||||||
coroutine_type_and_layout.variants
|
coroutine_type_and_layout.variants
|
||||||
|
|
|
@ -1072,7 +1072,7 @@ fn variant_info_for_coroutine<'tcx>(
|
||||||
return (vec![], None);
|
return (vec![], None);
|
||||||
};
|
};
|
||||||
|
|
||||||
let coroutine = cx.tcx.optimized_mir(def_id).coroutine_layout().unwrap();
|
let coroutine = cx.tcx.coroutine_layout(def_id).unwrap();
|
||||||
let upvar_names = cx.tcx.closure_saved_names_of_captured_variables(def_id);
|
let upvar_names = cx.tcx.closure_saved_names_of_captured_variables(def_id);
|
||||||
|
|
||||||
let mut upvars_size = Size::ZERO;
|
let mut upvars_size = Size::ZERO;
|
||||||
|
|
Loading…
Add table
Reference in a new issue