diff options
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 14 | ||||
| -rw-r--r-- | src/test/debuginfo/msvc-pretty-enums.rs | 3 | ||||
| -rw-r--r-- | src/test/debuginfo/pretty-std.rs | 3 |
3 files changed, 14 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 1f268bd1878..0f512fcaaaf 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -1687,7 +1687,13 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> { source_info: None, }]; - set_members_of_composite_type(cx, self.enum_type, variant_metadata, members, None); + set_members_of_composite_type( + cx, + self.enum_type, + variant_metadata, + members, + None, + ); let variant_info = variant_info_for(dataful_variant); let (variant_type_metadata, member_desc_factory) = describe_enum_variant( @@ -1932,9 +1938,9 @@ fn describe_enum_variant( // We have the layout of an enum variant, we need the layout of the outer enum let enum_layout = cx.layout_of(layout.ty); let offset = enum_layout.fields.offset(tag_field.as_usize()); - let tag_name = if cx.tcx.sess.target.is_like_msvc { "variant$" } else { "RUST$ENUM$DISR" }; - let args = - (tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty); + let tag_name = + if cx.tcx.sess.target.is_like_msvc { "variant$" } else { "RUST$ENUM$DISR" }; + let args = (tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty); (Some(offset), Some(args)) } _ => (None, None), diff --git a/src/test/debuginfo/msvc-pretty-enums.rs b/src/test/debuginfo/msvc-pretty-enums.rs index 146be23bbb3..ad1b45a7bc2 100644 --- a/src/test/debuginfo/msvc-pretty-enums.rs +++ b/src/test/debuginfo/msvc-pretty-enums.rs @@ -1,4 +1,5 @@ // only-cdb +// ignore-tidy-linelength // compile-flags:-g // cdb-command: g @@ -101,4 +102,4 @@ fn main() { zzz(); // #break } -fn zzz() { () } \ No newline at end of file +fn zzz() { () } diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index aad8ae5cd9f..e9f690fac2e 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -1,6 +1,7 @@ // ignore-freebsd: gdb package too new // only-cdb // "Temporarily" ignored on GDB/LLDB due to debuginfo tests being disabled, see PR 47155 // ignore-android: FIXME(#10381) +// ignore-tidy-linelength // compile-flags:-g // min-gdb-version: 7.7 // min-lldb-version: 310 @@ -115,7 +116,7 @@ // cdb-command: dx none // cdb-check:none : None [Type: _enum<core::option::Option<i64>>] // cdb-command: dx some_string -// cdb-check:some_string [Type: _enum<core::option::Option<alloc::string::String>, 1, 18446744073709551615, Some>] +// cdb-check:some_string [Type: _enum<core::option::Option<alloc::string::String>, 1, [...], Some>] #![allow(unused_variables)] use std::ffi::OsString; |