mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
974bc455ee
rust/tests/debuginfo/msvc-pretty-enums.rs

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

249 lines
9.7 KiB
Rust
Raw Normal View History

Add/update tests
2021-05-13 11:56:33 -05:00
// only-cdb
// compile-flags:-g
// cdb-command: g
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-command: dx a
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:a : Some [Type: enum2$<core::option::Option<msvc_pretty_enums::CStyleEnum> >]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-check: [+0x000] __0 : Low (0x2) [Type: msvc_pretty_enums::CStyleEnum]
// cdb-command: dx b
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:b : None [Type: enum2$<core::option::Option<msvc_pretty_enums::CStyleEnum> >]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-command: dx c
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:c : Tag1 [Type: enum2$<msvc_pretty_enums::NicheLayoutEnum>]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-command: dx d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:d : Data [Type: enum2$<msvc_pretty_enums::NicheLayoutEnum>]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-check: [+0x000] my_data : High (0x10) [Type: msvc_pretty_enums::CStyleEnum]
// cdb-command: dx e
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:e : Tag2 [Type: enum2$<msvc_pretty_enums::NicheLayoutEnum>]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-command: dx f
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:f : Some [Type: enum2$<core::option::Option<ref$<u32> > >]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-check: [+0x000] __0 : 0x[...] : 0x1 [Type: unsigned int *]
// cdb-command: dx g
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:g : None [Type: enum2$<core::option::Option<ref$<u32> > >]
Update directly tagged enums to visualize the same as niche-layout enums Previously, directly tagged enums had a `variant$` field which would show the name of the active variant. We now show the variant using a `[variant]` synthetic item just like we do for niche-layout enums.
2021-06-24 15:37:03 -05:00
Add/update tests
2021-05-13 11:56:33 -05:00
// cdb-command: dx h
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:h : Some [Type: enum2$<core::option::Option<u32> >]
Add/update tests
2021-05-13 11:56:33 -05:00
// cdb-check: [+0x004] __0 : 0xc [Type: unsigned int]
// cdb-command: dx i
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:i : None [Type: enum2$<core::option::Option<u32> >]
Add/update tests
2021-05-13 11:56:33 -05:00
// cdb-command: dx j
// cdb-check:j : High (0x10) [Type: msvc_pretty_enums::CStyleEnum]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-command: dx k
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:k : Some [Type: enum2$<core::option::Option<alloc::string::String> >]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-check: [+0x000] __0 : "IAMA optional string!" [Type: alloc::string::String]
// cdb-command: dx l
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check:l : Ok [Type: enum2$<core::result::Result<u32,enum2$<msvc_pretty_enums::Empty> > >]
Fix debuginfo tests for the latest version of the Windows SDK. - Cdb now correctly visualizes enums. - Cdb doesn't render emoji characters in `OSStr` anymore. - Cdb doesn't always render `str` correctly (#88840)
2021-09-10 18:51:10 -05:00
// cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int]
Show the variant name for univariant enums Previously, only the fields would be displayed with no indication of the variant name. If you already knew the enum was univariant, this was ok but if the enum was univariant because of layout, for example, a `Result<T, !>` then it could be very confusing which variant was the active one.
2021-06-25 12:33:00 -05:00
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-command: dx niche128_some
Update tests.
2024-01-20 11:55:53 -06:00
// cdb-check: niche128_some : Some [Type: enum2$<core::option::Option<core::num::nonzero::NonZero<i128> > >]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// Note: we can't actually read the value of the field because CDB cannot handle 128 bit integers.
Update tests.
2024-01-20 11:55:53 -06:00
// cdb-check: [+0x000] __0 [...] [Type: core::num::nonzero::NonZero<i128>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-command: dx niche128_none
Update tests.
2024-01-20 11:55:53 -06:00
// cdb-check: niche128_none : None [Type: enum2$<core::option::Option<core::num::nonzero::NonZero<i128> > >]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
Change name of "dataful" variant to "untagged" This is in anticipation of a new enum layout, in which the niche optimization may be applied even when multiple variants have data.
2022-08-24 20:14:23 -05:00
// cdb-command: dx wrapping_niche128_untagged
// cdb-check: wrapping_niche128_untagged : X [Type: enum2$<msvc_pretty_enums::Wrapping128Niche>]
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
// cdb-check: [+0x[...]] __0 [Type: msvc_pretty_enums::Wrapping128]
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
// cdb-command: dx wrapping_niche128_none1
// cdb-check: wrapping_niche128_none1 : Y [Type: enum2$<msvc_pretty_enums::Wrapping128Niche>]
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
// cdb-check: [+0x[...]] __0 [Type: msvc_pretty_enums::Wrapping128]
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
// cdb-command: dx wrapping_niche128_none2
// cdb-check: wrapping_niche128_none2 : Z [Type: enum2$<msvc_pretty_enums::Wrapping128Niche>]
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
// cdb-check: [+0x[...]] __0 [Type: msvc_pretty_enums::Wrapping128]
// cdb-command: dx direct_tag_128_a,d
// cdb-check: direct_tag_128_a,d : A [Type: enum2$<msvc_pretty_enums::DirectTag128>]
// cdb-check: [+0x[...]] __0 : 42 [Type: unsigned int]
// cdb-command: dx direct_tag_128_b,d
// cdb-check: direct_tag_128_b,d : B [Type: enum2$<msvc_pretty_enums::DirectTag128>]
// cdb-check: [+0x[...]] __0 : 137 [Type: unsigned int]
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-command: dx niche_w_fields_1_some,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_1_some,d : A [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields1>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 0x[...] : 77 [Type: unsigned char *]
// cdb-check: [+0x[...]] __1 : 7 [Type: unsigned int]
// cdb-command: dx niche_w_fields_1_none,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_1_none,d : B [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields1>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 99 [Type: unsigned int]
// cdb-command: dx niche_w_fields_2_some,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_2_some,d : A [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields2>]
Update tests.
2024-01-20 11:55:53 -06:00
// cdb-check: [+0x[...]] __0 : 800 [Type: core::num::nonzero::NonZero<u32>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __1 : 900 [Type: unsigned __int64]
// cdb-command: dx niche_w_fields_2_none,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_2_none,d : B [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields2>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 1000 [Type: unsigned __int64]
// cdb-command: dx niche_w_fields_3_some,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_some,d : A [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 137 [Type: unsigned char]
// cdb-check: [+0x[...]] __1 : true [Type: bool]
// cdb-command: dx niche_w_fields_3_niche1,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_niche1,d : B [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 12 [Type: unsigned char]
// cdb-command: dx niche_w_fields_3_niche2,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_niche2,d : C [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : false [Type: bool]
// cdb-command: dx niche_w_fields_3_niche3,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_niche3,d : D [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 34 [Type: unsigned char]
// cdb-command: dx niche_w_fields_3_niche4,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_niche4,d : E [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 56 [Type: unsigned char]
// cdb-command: dx niche_w_fields_3_niche5,d
Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names. And add more comments about niche tag enum encoding.
2022-07-07 08:01:43 -05:00
// cdb-check: niche_w_fields_3_niche5,d : F [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields3>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-command: dx -r3 niche_w_fields_std_result_ok,d
[debuginfo] Make debuginfo type names for slices and str consistent. Before this PR, the compiler would emit the debuginfo name `slice$<T>` for all kinds of slices, regardless of whether they are behind a reference or not and regardless of the kind of reference. As a consequence, the types `Foo<&[T]>`, `Foo<[T]>`, and `Foo<&mut [T]>` would end up with the same type name `Foo<slice$<T> >` in debuginfo, making it impossible to disambiguate between them by name. Similarly, `&str` would get the name `str` in debuginfo, so the debuginfo name for `Foo<str>` and `Foo<&str>` would be the same. In contrast, `*const [bool]` and `*mut [bool]` would be `ptr_const$<slice$<bool> >` and `ptr_mut$<slice$<bool> >`, i.e. the encoding does not lose information about the type. This PR removes all special handling for slices and `str`. The types `&[bool]`, `&mut [bool]`, and `&str` thus get the names `ref$<slice2$<bool> >`, `ref_mut$<slice2$<bool> >`, and `ref$<str$>` respectively -- as one would expect.
2022-10-25 05:28:03 -05:00
// cdb-check: niche_w_fields_std_result_ok,d : Ok [Type: enum2$<core::result::Result<alloc::boxed::Box<slice2$<u8>,alloc::alloc::Global>,u64> >]
// cdb-check: [+0x[...]] __0 [Type: alloc::boxed::Box<slice2$<u8>,alloc::alloc::Global>]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] data_ptr : [...]
// cdb-check: [+0x[...]] length : 3 [...]
// cdb-command: dx -r3 niche_w_fields_std_result_err,d
[debuginfo] Make debuginfo type names for slices and str consistent. Before this PR, the compiler would emit the debuginfo name `slice$<T>` for all kinds of slices, regardless of whether they are behind a reference or not and regardless of the kind of reference. As a consequence, the types `Foo<&[T]>`, `Foo<[T]>`, and `Foo<&mut [T]>` would end up with the same type name `Foo<slice$<T> >` in debuginfo, making it impossible to disambiguate between them by name. Similarly, `&str` would get the name `str` in debuginfo, so the debuginfo name for `Foo<str>` and `Foo<&str>` would be the same. In contrast, `*const [bool]` and `*mut [bool]` would be `ptr_const$<slice$<bool> >` and `ptr_mut$<slice$<bool> >`, i.e. the encoding does not lose information about the type. This PR removes all special handling for slices and `str`. The types `&[bool]`, `&mut [bool]`, and `&str` thus get the names `ref$<slice2$<bool> >`, `ref_mut$<slice2$<bool> >`, and `ref$<str$>` respectively -- as one would expect.
2022-10-25 05:28:03 -05:00
// cdb-check: niche_w_fields_std_result_err,d : Err [Type: enum2$<core::result::Result<alloc::boxed::Box<slice2$<u8>,alloc::alloc::Global>,u64> >]
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// cdb-check: [+0x[...]] __0 : 789 [Type: unsigned __int64]
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
// cdb-command: dx -r2 arbitrary_discr1,d
// cdb-check: arbitrary_discr1,d : Abc [Type: enum2$<msvc_pretty_enums::ArbitraryDiscr>]
// cdb-check: [+0x[...]] __0 : 1234 [Type: unsigned int]
// cdb-command: dx -r2 arbitrary_discr2,d
// cdb-check: arbitrary_discr2,d : Def [Type: enum2$<msvc_pretty_enums::ArbitraryDiscr>]
// cdb-check: [+0x[...]] __0 : 5678 [Type: unsigned int]
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
#![feature(rustc_attrs)]
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
#![feature(repr128)]
#![feature(arbitrary_enum_discriminant)]
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
use std::num::{NonZeroI128, NonZeroU32};
Add/update tests
2021-05-13 11:56:33 -05:00
pub enum CStyleEnum {
Low = 2,
High = 16,
}
pub enum NicheLayoutEnum {
Tag1,
Data { my_data: CStyleEnum },
Tag2,
}
debuginfo: Refactor debuginfo generation for types This commit - changes names to use di_node instead of metadata - uniformly names all functions that build new debuginfo nodes build_xyz_di_node - renames CrateDebugContext to CodegenUnitDebugContext (which is more accurate) - moves TypeMap and functions that work directly work with it to a new type_map module - moves and reimplements enum related builder functions to a new enums module - splits enum debuginfo building for the native and cpp-like cases, since they are mostly separate - uses SmallVec instead of Vec in many places - removes the old infrastructure for dealing with recursion cycles (create_and_register_recursive_type_forward_declaration(), RecursiveTypeDescription, set_members_of_composite_type(), MemberDescription, MemberDescriptionFactory, prepare_xyz_metadata(), etc) - adds type_map::build_type_with_children() as a replacement for dealing with recursion cycles - adds many (doc-)comments explaining what's going on - changes cpp-like naming for C-Style enums so they don't get a enum$<...> name (because the NatVis visualizer does not apply to them) - fixes detection of what is a C-style enum because some enums where classified as C-style even though they have fields - changes the position of discriminant debuginfo node so it is consistently nested inside the top-level union instead of, sometimes, next to it
2022-03-03 04:15:25 -06:00
pub enum Empty {}
Show the variant name for univariant enums Previously, only the fields would be displayed with no indication of the variant name. If you already knew the enum was univariant, this was ok but if the enum was univariant because of layout, for example, a `Result<T, !>` then it could be very confusing which variant was the active one.
2021-06-25 12:33:00 -05:00
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
// The following three types will use a niche layout once
// https://github.com/rust-lang/rust/pull/94075 is merged:
enum NicheLayoutWithFields1<'a> {
A(&'a u8, u32),
B(u32),
}
enum NicheLayoutWithFields2 {
[debuginfo] Fix msvc-pretty-enums debuginfo test for i686.
2022-08-15 03:50:09 -05:00
A(NonZeroU32, u64),
B(u64),
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
}
enum NicheLayoutWithFields3 {
A(u8, bool),
B(u8),
C(bool),
D(u8),
E(u8),
F,
}
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
#[rustc_layout_scalar_valid_range_start(340282366920938463463374607431768211454)]
#[rustc_layout_scalar_valid_range_end(1)]
#[repr(transparent)]
struct Wrapping128(u128);
// #[rustc_layout(debug)]
enum Wrapping128Niche {
X(Wrapping128),
Y,
Z,
}
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
#[repr(i128)]
enum DirectTag128 {
A(u32),
B(u32),
}
#[repr(u32)]
enum ArbitraryDiscr {
Abc(u32) = 1000,
Def(u32) = 5000_000,
}
Add/update tests
2021-05-13 11:56:33 -05:00
fn main() {
let a = Some(CStyleEnum::Low);
let b = Option::<CStyleEnum>::None;
let c = NicheLayoutEnum::Tag1;
let d = NicheLayoutEnum::Data { my_data: CStyleEnum::High };
let e = NicheLayoutEnum::Tag2;
let f = Some(&1u32);
let g = Option::<&'static u32>::None;
let h = Some(12u32);
let i = Option::<u32>::None;
let j = CStyleEnum::High;
let k = Some("IAMA optional string!".to_string());
Show the variant name for univariant enums Previously, only the fields would be displayed with no indication of the variant name. If you already knew the enum was univariant, this was ok but if the enum was univariant because of layout, for example, a `Result<T, !>` then it could be very confusing which variant was the active one.
2021-06-25 12:33:00 -05:00
let l = Result::<u32, Empty>::Ok(42);
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
let niche128_some = Some(NonZeroI128::new(123456).unwrap());
let niche128_none: Option<NonZeroI128> = None;
Change name of "dataful" variant to "untagged" This is in anticipation of a new enum layout, in which the niche optimization may be applied even when multiple variants have data.
2022-08-24 20:14:23 -05:00
let wrapping_niche128_untagged =
Support wrapping 128-bit tag ranges for cpp-like enum debuginfo.
2022-07-07 08:04:23 -05:00
unsafe { Wrapping128Niche::X(Wrapping128(340282366920938463463374607431768211454)) };
let wrapping_niche128_none1 = Wrapping128Niche::Y;
let wrapping_niche128_none2 = Wrapping128Niche::Z;
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
let direct_tag_128_a = DirectTag128::A(42);
let direct_tag_128_b = DirectTag128::B(137);
debuginfo: Change C++-like encoding for enums. The updated encoding should be able to handle niche layouts where more than one variant has fields.
2022-06-20 10:50:27 -05:00
let niche_w_fields_1_some = NicheLayoutWithFields1::A(&77, 7);
let niche_w_fields_1_none = NicheLayoutWithFields1::B(99);
let niche_w_fields_2_some = NicheLayoutWithFields2::A(NonZeroU32::new(800).unwrap(), 900);
let niche_w_fields_2_none = NicheLayoutWithFields2::B(1000);
let niche_w_fields_3_some = NicheLayoutWithFields3::A(137, true);
let niche_w_fields_3_niche1 = NicheLayoutWithFields3::B(12);
let niche_w_fields_3_niche2 = NicheLayoutWithFields3::C(false);
let niche_w_fields_3_niche3 = NicheLayoutWithFields3::D(34);
let niche_w_fields_3_niche4 = NicheLayoutWithFields3::E(56);
let niche_w_fields_3_niche5 = NicheLayoutWithFields3::F;
let niche_w_fields_std_result_ok: Result<Box<[u8]>, u64> = Ok(vec![1, 2, 3].into());
let niche_w_fields_std_result_err: Result<Box<[u8]>, u64> = Err(789);
Add/update tests
2021-05-13 11:56:33 -05:00
[debuginfo] Add more test cases cpp-like enum debuginfo.
2022-07-07 10:22:04 -05:00
let arbitrary_discr1 = ArbitraryDiscr::Abc(1234);
let arbitrary_discr2 = ArbitraryDiscr::Def(5678);
Add/update tests
2021-05-13 11:56:33 -05:00
zzz(); // #break
}
debuginfo: Refactor debuginfo generation for types This commit - changes names to use di_node instead of metadata - uniformly names all functions that build new debuginfo nodes build_xyz_di_node - renames CrateDebugContext to CodegenUnitDebugContext (which is more accurate) - moves TypeMap and functions that work directly work with it to a new type_map module - moves and reimplements enum related builder functions to a new enums module - splits enum debuginfo building for the native and cpp-like cases, since they are mostly separate - uses SmallVec instead of Vec in many places - removes the old infrastructure for dealing with recursion cycles (create_and_register_recursive_type_forward_declaration(), RecursiveTypeDescription, set_members_of_composite_type(), MemberDescription, MemberDescriptionFactory, prepare_xyz_metadata(), etc) - adds type_map::build_type_with_children() as a replacement for dealing with recursion cycles - adds many (doc-)comments explaining what's going on - changes cpp-like naming for C-Style enums so they don't get a enum$<...> name (because the NatVis visualizer does not apply to them) - fixes detection of what is a C-style enum because some enums where classified as C-style even though they have fields - changes the position of discriminant debuginfo node so it is consistently nested inside the top-level union instead of, sometimes, next to it
2022-03-03 04:15:25 -06:00
fn zzz() {
()
}
Reference in New Issue Copy Permalink