From 15dbe652ffa260fda162be3fa8e7aa075884c412 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Fri, 3 May 2019 16:03:05 -0700 Subject: Split out debuginfo from type info in MIR GeneratorLayout --- src/librustc_codegen_llvm/debuginfo/metadata.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/librustc_codegen_llvm/debuginfo') diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index b09fe827b24..5b18e821982 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -1597,8 +1597,9 @@ impl<'tcx> VariantInfo<'tcx> { VariantInfo::Adt(variant) if variant.ctor_kind != CtorKind::Fn => Some(variant.fields[i].ident.to_string()), VariantInfo::Generator(_, generator_layout, variant_index) => { - let variant_decls = &generator_layout.variant_fields[*variant_index]; - variant_decls[i.into()].name.map(|name| name.to_string()) + let field = generator_layout.variant_fields[*variant_index][i.into()]; + let decl = &generator_layout.__local_debuginfo_codegen_only_do_not_use[field]; + decl.name.map(|name| name.to_string()) } _ => None, }; -- cgit 1.4.1-3-g733a5