diff options
| author | bors <bors@rust-lang.org> | 2022-01-11 21:02:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-11 21:02:01 +0000 |
| commit | 72e74d7b9cf1a7901650227e74650f1fcc797600 (patch) | |
| tree | cedb10f9970594827c6e9dd5063521947c3a4f4f /compiler/rustc_codegen_gcc | |
| parent | 1409c015b44a4d4d38bef2250b2a37c17b8b7463 (diff) | |
| parent | 450ef8613ce80278b98e1b1a73448ea810322567 (diff) | |
| download | rust-72e74d7b9cf1a7901650227e74650f1fcc797600.tar.gz rust-72e74d7b9cf1a7901650227e74650f1fcc797600.zip | |
Auto merge of #92533 - Aaron1011:variant-symbol, r=petrochenkov
Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` The field is also renamed from `ident` to `name`. In most cases, we don't actually need the `Span`. A new `ident` method is added to `VariantDef` and `FieldDef`, which constructs the full `Ident` using `tcx.def_ident_span()`. This method is used in the cases where we actually need an `Ident`. This makes incremental compilation properly track changes to the `Span`, without all of the invalidations caused by storing a `Span` directly via an `Ident`.
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/type_of.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/type_of.rs b/compiler/rustc_codegen_gcc/src/type_of.rs index 9c39c8f91a1..281e49fa8a3 100644 --- a/compiler/rustc_codegen_gcc/src/type_of.rs +++ b/compiler/rustc_codegen_gcc/src/type_of.rs @@ -57,7 +57,7 @@ pub fn uncached_gcc_type<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, layout: TyAndLa (layout.ty.kind(), &layout.variants) { if def.is_enum() && !def.variants.is_empty() { - write!(&mut name, "::{}", def.variants[index].ident).unwrap(); + write!(&mut name, "::{}", def.variants[index].name).unwrap(); } } if let (&ty::Generator(_, _, _), &Variants::Single { index }) = |
