bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Make tidy happy

Browse source
This commit is contained in:
Wesley Wiser 2021-05-14 11:17:26 -04:00
parent 2a9fa202fe
commit d650091117
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View file

@ -1687,7 +1687,13 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
source_info: None, 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_info = variant_info_for(dataful_variant);
let (variant_type_metadata, member_desc_factory) = describe_enum_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 // 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 enum_layout = cx.layout_of(layout.ty);
let offset = enum_layout.fields.offset(tag_field.as_usize()); 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 tag_name =
let args = if cx.tcx.sess.target.is_like_msvc { "variant$" } else { "RUST$ENUM$DISR" };
(tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty); let args = (tag_name.to_owned(), enum_layout.field(cx, tag_field.as_usize()).ty);
(Some(offset), Some(args)) (Some(offset), Some(args))
} }
_ => (None, None), _ => (None, None),

1
src/test/debuginfo/msvc-pretty-enums.rs
View file

@ -1,4 +1,5 @@
// only-cdb // only-cdb
// ignore-tidy-linelength
// compile-flags:-g // compile-flags:-g
// cdb-command: g // cdb-command: g

3
src/test/debuginfo/pretty-std.rs
View file

@ -1,6 +1,7 @@
// ignore-freebsd: gdb package too new // ignore-freebsd: gdb package too new
// only-cdb // "Temporarily" ignored on GDB/LLDB due to debuginfo tests being disabled, see PR 47155 // only-cdb // "Temporarily" ignored on GDB/LLDB due to debuginfo tests being disabled, see PR 47155
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// ignore-tidy-linelength
// compile-flags:-g // compile-flags:-g
// min-gdb-version: 7.7 // min-gdb-version: 7.7
// min-lldb-version: 310 // min-lldb-version: 310
@ -115,7 +116,7 @@
// cdb-command: dx none // cdb-command: dx none
// cdb-check:none : None [Type: _enum<core::option::Option<i64>>] // cdb-check:none : None [Type: _enum<core::option::Option<i64>>]
// cdb-command: dx some_string // 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)] #![allow(unused_variables)]
use std::ffi::OsString; use std::ffi::OsString;