Re-enable 16 debuginfo tests.

These tests were disabled four years ago; it appears that it was
intended to be temporary.

In that time their assertions have rotted. I've gone through and fixed
the assertions where necessary and rehabilitated them. In several cases
I've had to leave lldb disabled, because the lldb output has changed in
ways that I don't understand. I figured gdb coverage was better than no
coverage.

It's worth noting that these tests being enabled would probably have
caught the regression observed in rust-lang#90357.

Author: cbiffle

src/test/debuginfo/basic-types-globals-metadata.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 // gdb-command:run
@@ -11,7 +10,7 @@
 // gdb-check:type = isize
 // gdbg-command:whatis 'basic_types_globals_metadata::C'
 // gdbr-command:whatis basic_types_globals_metadata::C
-// gdb-check:type = char
+// gdb-check:type = char32_t
 // gdbg-command:whatis 'basic_types_globals_metadata::I8'
 // gdbr-command:whatis basic_types_globals_metadata::I8
 // gdb-check:type = i8

src/test/debuginfo/basic-types-metadata.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 // gdb-command:run
@@ -10,7 +9,7 @@
 // gdb-command:whatis i
 // gdb-check:type = isize
 // gdb-command:whatis c
-// gdb-check:type = char
+// gdb-check:type = char32_t
 // gdb-command:whatis i8
 // gdb-check:type = i8
 // gdb-command:whatis i16
@@ -34,31 +33,31 @@
 // gdb-command:whatis f64
 // gdb-check:type = f64
 // gdb-command:whatis fnptr
-// gdb-check:type = [...] (*)([...])
+// gdb-check:type = *mut fn ()
 // gdb-command:info functions _yyy
 // gdbg-check:[...]![...]_yyy([...]);
-// gdbr-check:static fn basic_types_metadata::_yyy() -> !;
+// gdbr-check:static fn basic_types_metadata::_yyy();
 // gdb-command:ptype closure_0
-// gdbr-check: type = struct closure
+// gdbr-check: type = struct basic_types_metadata::main::{closure_env#0}
 // gdbg-check: type = struct closure {
 // gdbg-check:     <no data fields>
 // gdbg-check: }
 // gdb-command:ptype closure_1
 // gdbg-check: type = struct closure {
 // gdbg-check:     bool *__0;
 // gdbg-check: }
-// gdbr-check: type = struct closure (
-// gdbr-check:     bool *,
-// gdbr-check: )
+// gdbr-check: type = struct basic_types_metadata::main::{closure_env#1} {
+// gdbr-check:     _ref__b: *mut bool,
+// gdbr-check: }
 // gdb-command:ptype closure_2
 // gdbg-check: type = struct closure {
 // gdbg-check:     bool *__0;
 // gdbg-check:     isize *__1;
 // gdbg-check: }
-// gdbr-check: type = struct closure (
-// gdbr-check:     bool *,
-// gdbr-check:     isize *,
-// gdbr-check: )
+// gdbr-check: type = struct basic_types_metadata::main::{closure_env#2} {
+// gdbr-check:     _ref__b: *mut bool,
+// gdbr-check:     _ref__i: *mut isize,
+// gdbr-check: }
 
 //
 // gdb-command:continue

src/test/debuginfo/basic-types-mut-globals.rs

@@ -5,7 +5,6 @@
 // its numerical value.
 
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 
@@ -21,7 +20,7 @@
 // gdbg-command:print/d 'basic_types_mut_globals::C'
 // gdbr-command:print C
 // gdbg-check:$3 = 97
-// gdbr-check:$3 = 97 'a'
+// gdbr-check:$3 = 97
 // gdbg-command:print/d 'basic_types_mut_globals::I8'
 // gdbr-command:print I8
 // gdb-check:$4 = 68
@@ -67,7 +66,7 @@
 // gdbg-command:print/d 'basic_types_mut_globals'::C
 // gdbr-command:print C
 // gdbg-check:$17 = 102
-// gdbr-check:$17 = 102 'f'
+// gdbr-check:$17 = 102
 // gdbg-command:print/d 'basic_types_mut_globals'::I8
 // gdbr-command:print/d I8
 // gdb-check:$18 = 78

src/test/debuginfo/by-value-non-immediate-argument.rs

@@ -1,5 +1,5 @@
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // min-lldb-version: 310
+// ignore-lldb
 
 // compile-flags:-g
 

src/test/debuginfo/c-style-enum.rs

@@ -1,5 +1,4 @@
 // ignore-aarch64
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // min-lldb-version: 310
 
 // compile-flags:-g

src/test/debuginfo/function-arg-initialization.rs

@@ -1,5 +1,5 @@
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // min-lldb-version: 310
+// ignore-lldb
 
 // This test case checks if function arguments already have the correct value
 // when breaking at the first line of the function, that is if the function

src/test/debuginfo/function-prologue-stepping-regular.rs

@@ -1,9 +1,9 @@
 // This test case checks if function arguments already have the correct value when breaking at the
 // beginning of a function.
 
+// ignore-lldb
+
 // min-lldb-version: 310
-// ignore-gdb
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // compile-flags:-g
 
 // lldb-command:breakpoint set --name immediate_args

src/test/debuginfo/lexical-scopes-in-block-expression.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 

src/test/debuginfo/limited-debuginfo.rs

@@ -1,5 +1,4 @@
 // ignore-lldb
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-C debuginfo=1
 

src/test/debuginfo/option-like-enum.rs

@@ -1,6 +1,5 @@
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
-
 // min-lldb-version: 310
+// ignore-lldb
 
 // compile-flags:-g
 
@@ -22,19 +21,21 @@
 
 // gdbg-command:print empty_gdb->discr
 // gdbr-command:print empty_gdb.discr
-// gdb-check:$4 = (isize *) 0x0
+// gdbg-check:$4 = (isize *) 0x1
+// gdbr-check:$4 = (*mut isize) 0x1
 
 // gdb-command:print droid
 // gdbg-check:$5 = {RUST$ENCODED$ENUM$2$Void = {id = 675675, range = 10000001, internals = 0x43218765}}
 // gdbr-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
 
 // gdbg-command:print void_droid_gdb->internals
 // gdbr-command:print void_droid_gdb.internals
-// gdb-check:$6 = (isize *) 0x0
+// gdbg-check:$6 = (isize *) 0x0
+// gdbr-check:$6 = (*mut isize) 0x0
 
 // gdb-command:print nested_non_zero_yep
 // gdbg-check:$7 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = 10.5, __1 = {a = 10, b = 20, c = [...]}}}
-// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...] "x[...]"})
+// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...]})
 
 // gdb-command:print nested_non_zero_nope
 // gdbg-check:$8 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = [...], __1 = {a = [...], b = [...], c = 0x0}}}

src/test/debuginfo/simple-struct.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 

src/test/debuginfo/simple-tuple.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g
 

src/test/debuginfo/struct-in-enum.rs

@@ -1,6 +1,6 @@
 // min-lldb-version: 310
 // ignore-gdb-version: 7.11.90 - 7.12.9
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
+// ignore-lldb
 
 // compile-flags:-g
 

src/test/debuginfo/union-smoke.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // ignore-gdb-version: 7.11.90 - 7.12.9
 

src/test/debuginfo/vec.rs

@@ -1,5 +1,4 @@
 // min-lldb-version: 310
-// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 
 // compile-flags:-g