From f1f5108ca367bef48d1429e889f0ec9340de5038 Mon Sep 17 00:00:00 2001 From: Wesley Wiser Date: Fri, 10 Sep 2021 20:52:21 -0400 Subject: [PATCH 1/2] Revert "Temporarily ignore some debuginfo tests on windows." This reverts commit 8059bc1069b88a51ec2dfc2483854b9a854b1994. --- src/test/debuginfo/basic-types.rs | 4 ---- src/test/debuginfo/msvc-pretty-enums.rs | 4 ---- src/test/debuginfo/pretty-std.rs | 4 ---- 3 files changed, 12 deletions(-) diff --git a/src/test/debuginfo/basic-types.rs b/src/test/debuginfo/basic-types.rs index d300e374bec..c35c3255498 100644 --- a/src/test/debuginfo/basic-types.rs +++ b/src/test/debuginfo/basic-types.rs @@ -9,10 +9,6 @@ // This fails on lldb 6.0.1 on x86-64 Fedora 28; so ignore Linux for now. // ignore-linux -// This started failing in windows too. See https://github.com/rust-lang/rust/issues/88796 -// FIXME: fix and unignore this on windows -// ignore-windows - // compile-flags:-g // === GDB TESTS =================================================================================== diff --git a/src/test/debuginfo/msvc-pretty-enums.rs b/src/test/debuginfo/msvc-pretty-enums.rs index 67b5da510f8..9463f82c797 100644 --- a/src/test/debuginfo/msvc-pretty-enums.rs +++ b/src/test/debuginfo/msvc-pretty-enums.rs @@ -2,10 +2,6 @@ // ignore-tidy-linelength // compile-flags:-g -// This started failing recently. See https://github.com/rust-lang/rust/issues/88796 -// FIXME: fix and unignore this -// ignore-windows - // cdb-command: g // Note: The natvis used to visualize niche-layout enums don't work correctly in cdb diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index cb2e6c618b1..baeada69d1c 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -6,10 +6,6 @@ // min-lldb-version: 310 // min-cdb-version: 10.0.18317.1001 -// This started failing recently. See https://github.com/rust-lang/rust/issues/88796 -// FIXME: fix and unignore this -// ignore-windows - // === GDB TESTS =================================================================================== // gdb-command: run From e156df2a1cd722ebea9f2958d3627f1819835c0a Mon Sep 17 00:00:00 2001 From: Wesley Wiser Date: Fri, 10 Sep 2021 19:51:10 -0400 Subject: [PATCH 2/2] 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) --- src/test/debuginfo/basic-types.rs | 3 +- src/test/debuginfo/msvc-pretty-enums.rs | 106 +++++++++--------------- src/test/debuginfo/pretty-std.rs | 12 ++- 3 files changed, 51 insertions(+), 70 deletions(-) diff --git a/src/test/debuginfo/basic-types.rs b/src/test/debuginfo/basic-types.rs index c35c3255498..c8879856b96 100644 --- a/src/test/debuginfo/basic-types.rs +++ b/src/test/debuginfo/basic-types.rs @@ -128,8 +128,9 @@ // cdb-command:dx f64 // cdb-check:f64 : 3.500000 [Type: double] // cdb-command:.enable_unicode 1 +// FIXME(#88840): The latest version of the Windows SDK broke the visualizer for str. // cdb-command:dx s -// cdb-check:s : "Hello, World!" [Type: str] +// cdb-check:s : [...] [Type: str] #![allow(unused_variables)] #![feature(omit_gdb_pretty_printer_section)] diff --git a/src/test/debuginfo/msvc-pretty-enums.rs b/src/test/debuginfo/msvc-pretty-enums.rs index 9463f82c797..642694355ad 100644 --- a/src/test/debuginfo/msvc-pretty-enums.rs +++ b/src/test/debuginfo/msvc-pretty-enums.rs @@ -1,63 +1,45 @@ // only-cdb -// ignore-tidy-linelength // compile-flags:-g // cdb-command: g -// Note: The natvis used to visualize niche-layout enums don't work correctly in cdb -// so the best we can do is to make sure we are generating the right debuginfo. -// Therefore, we use the `!` [format specifier](https://docs.microsoft.com/en-us/visualstudio/debugger/format-specifiers-in-cpp?view=vs-2019#BKMK_Visual_Studio_2012_format_specifiers) -// to disable the natvis for a given expression. We also provide the `-r2` flag -// to expand the expression 2 levels. +// cdb-command: dx a +// cdb-check:a : Some({...}) [Type: enum$ >, 2, 16, Some>] +// cdb-check: [] [Type: enum$ >, 2, 16, Some>] +// cdb-check: [variant] : Some +// cdb-check: [+0x000] __0 : Low (0x2) [Type: msvc_pretty_enums::CStyleEnum] -// cdb-command: dx -r2 a,! -// cdb-check:a,! [Type: enum$ >, 2, 16, Some>] -// cdb-check: [+0x000] dataful_variant [Type: enum$ >, 2, 16, Some>::Some] -// cdb-check: [+0x000] __0 : Low (0x2) [Type: msvc_pretty_enums::CStyleEnum] -// cdb-check: [+0x000] discriminant : 0x2 [Type: enum$ >, 2, 16, Some>::Discriminant$] +// cdb-command: dx b +// cdb-check:b : None [Type: enum$ >, 2, 16, Some>] +// cdb-check: [] [Type: enum$ >, 2, 16, Some>] +// cdb-check: [variant] : None -// cdb-command: dx -r2 b,! -// cdb-check:b,! [Type: enum$ >, 2, 16, Some>] -// cdb-check: [+0x000] dataful_variant [Type: enum$ >, 2, 16, Some>::Some] -// cdb-check: [+0x000] __0 : 0x11 [Type: msvc_pretty_enums::CStyleEnum] -// cdb-check: [+0x000] discriminant : None (0x11) [Type: enum$ >, 2, 16, Some>::Discriminant$] +// cdb-command: dx c +// cdb-check:c : Tag1 [Type: enum$] +// cdb-check: [] [Type: enum$] +// cdb-check: [variant] : Tag1 -// cdb-command: dx -r2 c,! -// cdb-check:c,! [Type: enum$] -// cdb-check: [+0x000] dataful_variant [Type: enum$::Data] -// cdb-check: [+0x000] my_data : 0x11 [Type: msvc_pretty_enums::CStyleEnum] -// cdb-check: [+0x000] discriminant : Tag1 (0x11) [Type: enum$::Discriminant$] +// cdb-command: dx d +// cdb-check:d : Data({...}) [Type: enum$] +// cdb-check: [] [Type: enum$] +// cdb-check: [variant] : Data +// cdb-check: [+0x000] my_data : High (0x10) [Type: msvc_pretty_enums::CStyleEnum] -// cdb-command: dx -r2 d,! -// cdb-check:d,! [Type: enum$] -// cdb-check: [+0x000] dataful_variant [Type: enum$::Data] -// cdb-check: [+0x000] my_data : High (0x10) [Type: msvc_pretty_enums::CStyleEnum] -// cdb-check: [+0x000] discriminant : 0x10 [Type: enum$::Discriminant$] +// cdb-command: dx e +// cdb-check:e : Tag2 [Type: enum$] +// cdb-check: [] [Type: enum$] +// cdb-check: [variant] : Tag2 -// cdb-command: dx -r2 e,! -// cdb-check:e,! [Type: enum$] -// cdb-check: [+0x000] dataful_variant [Type: enum$::Data] -// cdb-check: [+0x000] my_data : 0x13 [Type: msvc_pretty_enums::CStyleEnum] -// cdb-check: [+0x000] discriminant : Tag2 (0x13) [Type: enum$::Discriminant$] +// cdb-command: dx f +// cdb-check:f : Some({...}) [Type: enum$ >, 1, [...], Some>] +// cdb-check: [] [Type: enum$ >, 1, [...], Some>] +// cdb-check: [variant] : Some +// cdb-check: [+0x000] __0 : 0x[...] : 0x1 [Type: unsigned int *] -// cdb-command: dx -r2 f,! -// cdb-check:f,! [Type: enum$ >, 1, [...], Some>] -// cdb-check: [+0x000] dataful_variant [Type: enum$ >, 1, [...], Some>::Some] -// cdb-check: [+0x000] __0 : 0x[...] : 0x1 [Type: unsigned int *] -// cdb-check: [+0x000] discriminant : 0x[...] [Type: enum$ >, 1, [...], Some>::Discriminant$] - -// cdb-command: dx -r2 g,! -// cdb-check:g,! [Type: enum$ >, 1, [...], Some>] -// cdb-check: [+0x000] dataful_variant [Type: enum$ >, 1, [...], Some>::Some] -// cdb-check: [+0x000] __0 : 0x0 [Type: unsigned int *] -// cdb-check: [+0x000] discriminant : None (0x0) [Type: enum$ >, 1, [...], Some>::Discriminant$] - -// cdb-command: dx -r2 h,! -// cdb-check:h,! : Some [Type: enum$ >] -// cdb-check: [+0x000] variant0 [Type: enum$ >::None] -// cdb-check: [+0x000] variant1 [Type: enum$ >::Some] -// cdb-check: [+0x004] __0 : 0xc [Type: unsigned int] -// cdb-check: [+0x000] discriminant : Some (0x1) [Type: core::option::Option] +// cdb-command: dx g +// cdb-check:g : None [Type: enum$ >, 1, [...], Some>] +// cdb-check: [] [Type: enum$ >, 1, [...], Some>] +// cdb-check: [variant] : None // cdb-command: dx h // cdb-check:h : Some [Type: enum$ >] @@ -65,13 +47,6 @@ // cdb-check: [variant] : Some // cdb-check: [+0x004] __0 : 0xc [Type: unsigned int] -// cdb-command: dx -r2 i,! -// cdb-check:i,! : None [Type: enum$ >] -// cdb-check: [+0x000] variant0 [Type: enum$ >::None] -// cdb-check: [+0x000] variant1 [Type: enum$ >::Some] -// cdb-check: [+0x004] __0 : 0x[...] [Type: unsigned int] -// cdb-check: [+0x000] discriminant : None (0x0) [Type: core::option::Option] - // cdb-command: dx i // cdb-check:i : None [Type: enum$ >] // cdb-check: [] [Type: enum$ >] @@ -80,16 +55,17 @@ // cdb-command: dx j // cdb-check:j : High (0x10) [Type: msvc_pretty_enums::CStyleEnum] -// cdb-command: dx -r2 k,! -// cdb-check:k,! [Type: enum$, 1, [...], Some>] -// cdb-check: [+0x000] dataful_variant [Type: enum$, 1, [...], Some>::Some] -// cdb-check: [+0x000] __0 [Type: alloc::string::String] -// cdb-check: [+0x000] discriminant : 0x[...] [Type: enum$, 1, [...], Some>::Discriminant$] +// cdb-command: dx k +// cdb-check:k : Some({...}) [Type: enum$, 1, [...], Some>] +// cdb-check: [] [Type: enum$, 1, [...], Some>] +// cdb-check: [variant] : Some +// cdb-check: [+0x000] __0 : "IAMA optional string!" [Type: alloc::string::String] -// cdb-command: dx -r2 l,! -// cdb-check:l,! : $T2 [Type: enum$ >, Ok>] -// cdb-check: [+0x000] Ok [Type: enum$ >, Ok>::Ok] -// cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int] +// cdb-command: dx l +// cdb-check:l : Ok [Type: enum$ >, Ok>] +// cdb-check: [] [Type: enum$ >, Ok>] +// cdb-check: [variant] : Ok +// cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int] pub enum CStyleEnum { Low = 2, diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index baeada69d1c..55a4ecc1c1a 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -111,9 +111,11 @@ // cdb-check: [11] : 33 '!' [Type: char] // cdb-command: dx os_string -// cdb-check:os_string : "IAMA OS string 😃" [Type: std::ffi::os_str::OsString] +// NOTE: OSString is WTF-8 encoded which Windows debuggers don't understand. Verify the UTF-8 +// portion displays correctly. +// cdb-check:os_string : "IAMA OS string [...]" [Type: std::ffi::os_str::OsString] // cdb-check: [] [Type: std::ffi::os_str::OsString] -// cdb-check: [chars] : "IAMA OS string 😃" +// cdb-check: [chars] : "IAMA OS string [...]" // cdb-command: dx some // cdb-check:some : Some [Type: enum$ >] @@ -127,8 +129,10 @@ // cdb-check: [variant] : None // cdb-command: dx some_string -// NOTE: cdb fails to interpret debug info of Option enums on i686. -// cdb-check:some_string [Type: enum$, 1, [...], Some>] +// cdb-check:some_string : Some({...}) [Type: enum$, 1, [...], Some>] +// cdb-check: [] [Type: enum$, 1, [...], Some>] +// cdb-check: [variant] : Some +// cdb-check: [+0x000] __0 : "IAMA optional string!" [Type: alloc::string::String] // cdb-command: dx linkedlist // cdb-check:linkedlist : { len=0x2 } [Type: alloc::collections::linked_list::LinkedList]