mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always use tcx.coroutine_layout over calling optimized_mir directly

Browse source
This commit is contained in:
Michael Goulet 2024-03-24 20:06:05 -04:00
parent 0824b300eb
commit 847fd88df7
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs
View file

@ -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);

3
compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/native.rs
View file

@ -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

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

@ -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;