diff options
| author | bors <bors@rust-lang.org> | 2023-03-31 03:36:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-31 03:36:18 +0000 |
| commit | eb3e9c1f45981b47160543cfd882ca00e69bbfab (patch) | |
| tree | cc4747b6e59743312330bab4400848109101043d /compiler/rustc_codegen_llvm | |
| parent | 276029deae08ad5b62f7d1ef2ea1acb7f5f529d8 (diff) | |
| parent | 4abb45552992da2c30df9626c1b522b3d10f789b (diff) | |
| download | rust-eb3e9c1f45981b47160543cfd882ca00e69bbfab.tar.gz rust-eb3e9c1f45981b47160543cfd882ca00e69bbfab.zip | |
Auto merge of #109762 - scottmcm:variantdef-indexvec, r=WaffleLapkin
Update `ty::VariantDef` to use `IndexVec<FieldIdx, FieldDef>` And while doing the updates for that, also uses `FieldIdx` in `ProjectionKind::Field` and `TypeckResults::field_indices`. There's more places that could use it (like `rustc_const_eval` and `LayoutS`), but I tried to keep this PR from exploding to *even more* places. Part 2/? of https://github.com/rust-lang/compiler-team/issues/606
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs index 3e4765fba57..c3439591b92 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs @@ -274,7 +274,8 @@ fn build_enum_variant_struct_type_di_node<'ll, 'tcx>( .map(|field_index| { let field_name = if variant_def.ctor_kind() != Some(CtorKind::Fn) { // Fields have names - Cow::from(variant_def.fields[field_index].name.as_str()) + let field = &variant_def.fields[FieldIdx::from_usize(field_index)]; + Cow::from(field.name.as_str()) } else { // Tuple-like super::tuple_field_name(field_index) |