From ef053fd6f0faa848097ff8b924ac859c667c8d15 Mon Sep 17 00:00:00 2001 From: Wesley Wiser Date: Thu, 20 May 2021 13:58:13 -0400 Subject: Change the type name from `_enum<..>` to `enum$<..>` This makes the type name inline with the proposed standard in #85269. --- compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src/debuginfo') diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 1d81d880b8d..f56dace0d33 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -1537,7 +1537,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> { // For MSVC, we generate a union of structs for each variant with an explicit // discriminant field roughly equivalent to the following C: // ```c - // union _enum<{name}> { + // union enum$<{name}> { // struct {variant 0 name} { // tag$ variant$; // @@ -1628,7 +1628,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> { // make the discriminant field that type. We then use natvis to render the enum type correctly in Windbg/VS. // This will generate debuginfo roughly equivalent to the following C: // ```c - // union _enum<{name}, {min niche}, {max niche}, {dataful variant name} { + // union enum$<{name}, {min niche}, {max niche}, {dataful variant name} { // struct dataful_variant { // // }, @@ -1639,7 +1639,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> { // } // } // ``` - // The natvis in `intrinsic.natvis` matches on the type name `_enum<*, *, *, *>` + // The natvis in `intrinsic.natvis` matches on the type name `enum$<*, *, *, *>` // and evaluates `this.discriminant$.discriminant`. If the value is between // the min niche and max niche, then the enum is in the dataful variant and // `this.dataful_variant` is rendered. Otherwise, the enum is in one of the -- cgit 1.4.1-3-g733a5