Skip to content

Commit 7237a68

Browse files
borsbors
committed
Auto merge of #128913 - saethlin:unignore-debuginfo-tests, r=<try>
Enable debuginfo tests that have been "temporarily disabled" for the past 6 years The PR history is a bit of a mess because I had to test this a lot with try-jobs, so I'll try to summarize the non-obvious changes here. A number of tests now have `min-lldb-version: 1800`. Those tests should have gotten an lldb version jump either in #124781 or long ago. Note that all such tests with that lldb version requirement do not run in Apple CI. `tests/debuginfo/drop-locations.rs` is staying disabled for now because gdb doesn't know to stop on the drop calls produced by a `}`: #128971 `tests/debuginfo/function-arg-initialization.rs` now has `-Zmir-enable-passes=-SingleUseConsts`; without that we initialize the const before the function prelude: #128945 `tests/debuginfo/by-value-non-immediate-argument.rs` fails because we don't generate a function prelude for unused non-immediate arguments, even with all optimizations disabled, and this seems to confuse debuggers on aarch64: #128973 `tests/debuginfo/pretty-std.rs` is staying disabled on windows-gnu because our test harness doesn't know how to load our pretty-printers on that target: #128981 `tests/debuginfo/method-on-enum.rs` and `tests/debuginfo/option-like-enum.rs` encounter some kind of gdb bug on i686-pc-windows-gnu. I don't know enough about that situation to write a good issue. I plan on doing more work on this test suite. There's clearly a lot more basic cleanup work to do here. try-job: aarch64-gnu try-job: arm-android try-job: armhf-gnu try-job: i686-gnu try-job: i686-gnu-nopt try-job: test-various try-job: x86_64-fuchsia try-job: x86_64-rust-for-linux try-job: x86_64-gnu try-job: x86_64-gnu-stable
2 parents d2b5aa6 + 23273e0 commit 7237a68

23 files changed

+48
-72
lines changed

‎tests/debuginfo/basic-types-globals-metadata.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-g
54
// gdb-command:run

‎tests/debuginfo/basic-types-metadata.rs

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-g
54
// gdb-command:run
@@ -36,31 +35,31 @@
3635
// gdb-command:whatis f64
3736
// gdb-check:type = f64
3837
// gdb-command:whatis fnptr
39-
// gdb-check:type = [...] (*)([...])
38+
// gdb-check:type = *mut fn ()
4039
// gdb-command:info functions _yyy
4140
// gdbg-check:[...]![...]_yyy([...]);
42-
// gdbr-check:static fn basic_types_metadata::_yyy() -> !;
41+
// gdbr-check:static fn basic_types_metadata::_yyy();
4342
// gdb-command:ptype closure_0
44-
// gdbr-check: type = struct closure
43+
// gdbr-check: type = struct basic_types_metadata::main::{closure_env#0}
4544
// gdbg-check: type = struct closure {
4645
// gdbg-check: <no data fields>
4746
// gdbg-check: }
4847
// gdb-command:ptype closure_1
4948
// gdbg-check: type = struct closure {
5049
// gdbg-check: bool *__0;
5150
// gdbg-check: }
52-
// gdbr-check: type = struct closure (
53-
// gdbr-check: bool *,
54-
// gdbr-check: )
51+
// gdbr-check: type = struct basic_types_metadata::main::{closure_env#1} {
52+
// gdbr-check: *mut bool,
53+
// gdbr-check: }
5554
// gdb-command:ptype closure_2
5655
// gdbg-check: type = struct closure {
5756
// gdbg-check: bool *__0;
5857
// gdbg-check: isize *__1;
5958
// gdbg-check: }
60-
// gdbr-check: type = struct closure (
61-
// gdbr-check: bool *,
62-
// gdbr-check: isize *,
63-
// gdbr-check: )
59+
// gdbr-check: type = struct basic_types_metadata::main::{closure_env#2} {
60+
// gdbr-check: *mut bool,
61+
// gdbr-check: *mut isize,
62+
// gdbr-check: }
6463

6564
//
6665
// gdb-command:continue

‎tests/debuginfo/basic-types.rs

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
//@ min-lldb-version: 310
88

9-
// This fails on lldb 6.0.1 on x86-64 Fedora 28; so ignore Linux for now.
10-
//@ ignore-linux
11-
129
//@ compile-flags:-g
1310

1411
// === GDB TESTS ===================================================================================

‎tests/debuginfo/by-value-non-immediate-argument.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
2-
//@ min-lldb-version: 310
3-
1+
//@ min-lldb-version: 1800
2+
//@ min-gdb-version: 13.0
43
//@ compile-flags:-g
54

65
// === GDB TESTS ===================================================================================
@@ -42,11 +41,11 @@
4241
// lldb-command:run
4342

4443
// lldb-command:v s
45-
// lldb-check:[...] Struct { a: 1, b: 2.5 }
44+
// lldb-check:[...] Struct { a = 1 b = 2.5 }
4645
// lldb-command:continue
4746

4847
// lldb-command:v x
49-
// lldb-check:[...] Struct { a: 3, b: 4.5 }
48+
// lldb-check:[...] Struct { a = 3 b = 4.5 }
5049
// lldb-command:v y
5150
// lldb-check:[...] 5
5251
// lldb-command:v z

‎tests/debuginfo/c-style-enum.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ ignore-aarch64
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32
//@ min-lldb-version: 310
43

54
//@ compile-flags:-g

‎tests/debuginfo/cross-crate-spans.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
//@ min-lldb-version: 310
55

6-
// This fails on lldb 6.0.1 on x86-64 Fedora 28; so mark it macOS-only
7-
// for now.
8-
//@ only-macos
9-
106
//@ aux-build:cross_crate_spans.rs
117
extern crate cross_crate_spans;
128

‎tests/debuginfo/destructured-for-loop-variable.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
//@ min-lldb-version: 310
22

3-
// This fails on lldb 6.0.1 on x86-64 Fedora 28; so mark it macOS-only
4-
// for now.
5-
//@ only-macos
6-
73
//@ compile-flags:-g
84

95
// === GDB TESTS ===================================================================================

‎tests/debuginfo/drop-locations.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
//@ ignore-windows
22
//@ ignore-android
3-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
43
//@ min-lldb-version: 310
4+
//@ ignore-test: #128971
55

66
#![allow(unused)]
77

8-
//@ compile-flags:-g -O -C no-prepopulate-passes
9-
// -O -C no-prepopulate-passes added to work around https://bugs.llvm.org/show_bug.cgi?id=32123
8+
//@ compile-flags:-g
109

1110
// This test checks that drop glue code gets attributed to scope's closing brace,
1211
// and function epilogues - to function's closing brace.

‎tests/debuginfo/function-arg-initialization.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
2-
//@ min-lldb-version: 310
3-
41
// This test case checks if function arguments already have the correct value
52
// when breaking at the first line of the function, that is if the function
63
// prologue has already been executed at the first line. Note that because of
74
// the __morestack part of the prologue GDB incorrectly breaks at before the
85
// arguments have been properly loaded when setting the breakpoint via the
96
// function name.
107

11-
//@ compile-flags:-g
8+
//@ min-lldb-version: 1800
9+
//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
10+
// SingleUseConsts shouldn't need to be disabled, see #128945
1211

1312
// === GDB TESTS ===================================================================================
1413

‎tests/debuginfo/function-prologue-stepping-regular.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// This test case checks if function arguments already have the correct value when breaking at the
22
// beginning of a function.
33

4-
//@ min-lldb-version: 310
4+
//@ min-lldb-version: 1800
55
//@ ignore-gdb
6-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
76
//@ compile-flags:-g
87

98
// lldb-command:breakpoint set --name immediate_args

‎tests/debuginfo/lexical-scopes-in-block-expression.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-g
54

‎tests/debuginfo/limited-debuginfo.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ ignore-lldb
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-C debuginfo=1
54

‎tests/debuginfo/macro-stepping.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@ ignore-windows
22
//@ ignore-android
33
//@ ignore-aarch64
4-
//@ min-lldb-version: 310
5-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
4+
//@ min-lldb-version: 1800
5+
//@ min-gdb-version: 13.0
66

77
//@ aux-build:macro-stepping.rs
88

@@ -11,7 +11,8 @@
1111
#[macro_use]
1212
extern crate macro_stepping; // exports new_scope!()
1313

14-
//@ compile-flags:-g
14+
//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
15+
// SingleUseConsts shouldn't need to be disabled, see #128945
1516

1617
// === GDB TESTS ===================================================================================
1718

‎tests/debuginfo/method-on-enum.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//@ min-lldb-version: 310
2-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
1+
//@ min-lldb-version: 1800
2+
//@ min-gdb-version: 13.0
33

44
//@ compile-flags:-g
55

‎tests/debuginfo/option-like-enum.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
2-
3-
//@ min-lldb-version: 310
1+
//@ min-lldb-version: 1800
2+
//@ min-gdb-version: 13.0
43

54
//@ compile-flags:-g
65

@@ -22,19 +21,19 @@
2221

2322
// gdbg-command:print empty_gdb->discr
2423
// gdbr-command:print empty_gdb.discr
25-
// gdb-check:$4 = (isize *) 0x0
24+
// gdb-check:$4 = (*mut isize) 0x1
2625

2726
// gdb-command:print droid
2827
// gdbg-check:$5 = {RUST$ENCODED$ENUM$2$Void = {id = 675675, range = 10000001, internals = 0x43218765}}
2928
// gdbr-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
3029

3130
// gdbg-command:print void_droid_gdb->internals
3231
// gdbr-command:print void_droid_gdb.internals
33-
// gdb-check:$6 = (isize *) 0x0
32+
// gdb-check:$6 = (*mut isize) 0x1
3433

3534
// gdb-command:print nested_non_zero_yep
3635
// gdbg-check:$7 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = 10.5, __1 = {a = 10, b = 20, c = [...]}}}
37-
// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...] "x[...]"})
36+
// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...]})
3837

3938
// gdb-command:print nested_non_zero_nope
4039
// gdbg-check:$8 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = [...], __1 = {a = [...], b = [...], c = 0x0}}}

‎tests/debuginfo/pretty-std-collections.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ ignore-windows failing on win32 bot
22
//@ ignore-freebsd: gdb package too new
33
//@ ignore-android: FIXME(#10381)
4+
//@ ignore-windows-gnu: #128981
45
//@ compile-flags:-g
56

67
// The pretty printers being tested here require the patch from

‎tests/debuginfo/pretty-std.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// ignore-tidy-linelength
22
//@ ignore-freebsd: gdb package too new
3-
//@ only-cdb // "Temporarily" ignored on GDB/LLDB due to debuginfo tests being disabled, see PR 47155
3+
//@ ignore-windows-gnu: #128981
44
//@ ignore-android: FIXME(#10381)
55
//@ compile-flags:-g
66
//@ min-gdb-version: 7.7
7-
//@ min-lldb-version: 310
7+
//@ min-lldb-version: 1800
88
//@ min-cdb-version: 10.0.18317.1001
99

1010
// === GDB TESTS ===================================================================================
1111

1212
// gdb-command: run
1313

1414
// gdb-command: print slice
15-
// gdb-check:$1 = &[i32](len: 4) = {0, 1, 2, 3}
15+
// gdb-check:$1 = &[i32](size=4) = {0, 1, 2, 3}
1616

1717
// gdb-command: print vec
18-
// gdb-check:$2 = Vec<u64, alloc::alloc::Global>(len: 4, cap: [...]) = {4, 5, 6, 7}
18+
// gdb-check:$2 = Vec(size=4) = {4, 5, 6, 7}
1919

2020
// gdb-command: print str_slice
2121
// gdb-check:$3 = "IAMA string slice!"
@@ -24,37 +24,37 @@
2424
// gdb-check:$4 = "IAMA string!"
2525

2626
// gdb-command: print some
27-
// gdb-check:$5 = Some = {8}
27+
// gdb-check:$5 = core::option::Option<i16>::Some(8)
2828

2929
// gdb-command: print none
3030
// gdbg-check:$6 = None
31-
// gdbr-check:$6 = core::option::Option::None
31+
// gdbr-check:$6 = core::option::Option<i64>::None
3232

3333
// gdb-command: print os_string
3434
// gdb-check:$7 = "IAMA OS string 😃"
3535

3636
// gdb-command: print some_string
37-
// gdb-check:$8 = Some = {"IAMA optional string!"}
37+
// gdb-check:$8 = core::option::Option<alloc::string::String>::Some("IAMA optional string!")
3838

39-
// gdb-command: set print length 5
39+
// gdb-command: set print elements 5
4040
// gdb-command: print some_string
41-
// gdb-check:$8 = Some = {"IAMA "...}
41+
// gdb-check:$9 = core::option::Option<alloc::string::String>::Some("IAMA "...)
4242

4343
// === LLDB TESTS ==================================================================================
4444

4545
// lldb-command:run
4646

4747
// lldb-command:v slice
48-
// lldb-check:[...] slice = &[0, 1, 2, 3]
48+
// lldb-check:[...] slice = size=4 { [0] = 0 [1] = 1 [2] = 2 [3] = 3 }
4949

5050
// lldb-command:v vec
51-
// lldb-check:[...] vec = vec![4, 5, 6, 7]
51+
// lldb-check:[...] vec = size=4 { [0] = 4 [1] = 5 [2] = 6 [3] = 7 }
5252

5353
// lldb-command:v str_slice
54-
// lldb-check:[...] str_slice = "IAMA string slice!"
54+
// lldb-check:[...] str_slice = "IAMA string slice!" { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 's' [6] = 't' [7] = 'r' [8] = 'i' [9] = 'n' [10] = 'g' [11] = ' ' [12] = 's' [13] = 'l' [14] = 'i' [15] = 'c' [16] = 'e' [17] = '!' }
5555

5656
// lldb-command:v string
57-
// lldb-check:[...] string = "IAMA string!"
57+
// lldb-check:[...] string = "IAMA string!" { vec = size=12 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 's' [6] = 't' [7] = 'r' [8] = 'i' [9] = 'n' [10] = 'g' [11] = '!' } }
5858

5959
// lldb-command:v some
6060
// lldb-check:[...] some = Some(8)
@@ -63,7 +63,7 @@
6363
// lldb-check:[...] none = None
6464

6565
// lldb-command:v os_string
66-
// lldb-check:[...] os_string = "IAMA OS string 😃"[...]
66+
// lldb-check:[...] os_string = "IAMA OS string 😃" { inner = { inner = size=19 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'O' [6] = 'S' [7] = ' ' [8] = 's' [9] = 't' [10] = 'r' [11] = 'i' [12] = 'n' [13] = 'g' [14] = ' ' [15] = '\xf0' [16] = '\x9f' [17] = '\x98' [18] = '\x83' } } }
6767

6868
// === CDB TESTS ==================================================================================
6969

‎tests/debuginfo/rc_arc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-windows-gnu: pretty-printers are not loaded
1+
//@ ignore-windows-gnu: #128981
22
//@ compile-flags:-g
33

44
//@ min-gdb-version: 8.1

‎tests/debuginfo/simple-struct.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags: -g -Zmir-enable-passes=-CheckAlignment
54

‎tests/debuginfo/simple-tuple.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-g
54

‎tests/debuginfo/struct-in-enum.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
//@ min-lldb-version: 310
1+
//@ min-lldb-version: 1800
22
//@ ignore-gdb-version: 7.11.90 - 7.12.9
3-
//@ ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
43

54
//@ compile-flags:-g
65

‎tests/debuginfo/union-smoke.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ ignore-gdb-version: 7.11.90 - 7.12.9
54

‎tests/debuginfo/vec.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ min-lldb-version: 310
2-
//@ ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
32

43
//@ compile-flags:-g
54

0 commit comments

Comments
 (0)