Delete lldbr annotations

73 files changed, 0 insertions, 677 deletions

diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index f85aa2aca96..54ea047d36c 100644
--- a/tests/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
@@ -38,41 +38,32 @@
 
 // lldb-command:v arg
 // lldbg-check:[...] { b = -1, b1 = 0 }
-// lldbr-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
 // lldb-command:continue
 
 // lldb-command:v inferred
 // lldbg-check:[...] 1
-// lldbr-check:(i64) inferred = 1
 // lldb-command:v explicitly
 // lldbg-check:[...] 1
-// lldbr-check:(i64) explicitly = 1
 // lldb-command:continue
 
 // lldb-command:v arg
 // lldbg-check:[...] 2
-// lldbr-check:(i64) arg = 2
 // lldb-command:continue
 
 // lldb-command:v arg
 // lldbg-check:[...] (4, 5)
-// lldbr-check:((i32, i64)) arg = { = 4 = 5 }
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 6
-// lldbr-check:(i32) a = 6
 // lldb-command:v b
 // lldbg-check:[...] 7
-// lldbr-check:(i64) b = 7
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 8
-// lldbr-check:(i64) a = 8
 // lldb-command:v b
 // lldbg-check:[...] 9
-// lldbr-check:(i32) b = 9
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/basic-types.rs b/tests/debuginfo/basic-types.rs
index b032186cf29..656c49ee001 100644
--- a/tests/debuginfo/basic-types.rs
+++ b/tests/debuginfo/basic-types.rs
@@ -47,48 +47,31 @@
 // lldb-command:run
 // lldb-command:v b
 // lldbg-check:[...] false
-// lldbr-check:(bool) b = false
 // lldb-command:v i
 // lldbg-check:[...] -1
-// lldbr-check:(isize) i = -1
-
-// NOTE: only rust-enabled lldb supports 32bit chars
-// lldbr-command:print c
-// lldbr-check:(char) c = 'a'
 
 // lldb-command:v i8
 // lldbg-check:[...] 'D'
-// lldbr-check:(i8) i8 = 68
 // lldb-command:v i16
 // lldbg-check:[...] -16
-// lldbr-check:(i16) i16 = -16
 // lldb-command:v i32
 // lldbg-check:[...] -32
-// lldbr-check:(i32) i32 = -32
 // lldb-command:v i64
 // lldbg-check:[...] -64
-// lldbr-check:(i64) i64 = -64
 // lldb-command:v u
 // lldbg-check:[...] 1
-// lldbr-check:(usize) u = 1
 // lldb-command:v u8
 // lldbg-check:[...] 'd'
-// lldbr-check:(u8) u8 = 100
 // lldb-command:v u16
 // lldbg-check:[...] 16
-// lldbr-check:(u16) u16 = 16
 // lldb-command:v u32
 // lldbg-check:[...] 32
-// lldbr-check:(u32) u32 = 32
 // lldb-command:v u64
 // lldbg-check:[...] 64
-// lldbr-check:(u64) u64 = 64
 // lldb-command:v f32
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) f32 = 2.5
 // lldb-command:v f64
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) f64 = 3.5
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/borrowed-basic.rs b/tests/debuginfo/borrowed-basic.rs
index 9a1c5472c2e..e51f5912fc2 100644
--- a/tests/debuginfo/borrowed-basic.rs
+++ b/tests/debuginfo/borrowed-basic.rs
@@ -54,62 +54,46 @@
 // lldb-command:run
 // lldb-command:v *bool_ref
 // lldbg-check:[...] true
-// lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:v *int_ref
 // lldbg-check:[...] -1
-// lldbr-check:(isize) *int_ref = -1
 
-// lldbr-command:print *char_ref
-// lldbr-check:(char) *char_ref = 'a'
 
 // lldb-command:v *i8_ref
 // lldbg-check:[...] 'D'
-// lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:v *i16_ref
 // lldbg-check:[...] -16
-// lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:v *i32_ref
 // lldbg-check:[...] -32
-// lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:v *i64_ref
 // lldbg-check:[...] -64
-// lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:v *uint_ref
 // lldbg-check:[...] 1
-// lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:v *u8_ref
 // lldbg-check:[...] 'd'
-// lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:v *u16_ref
 // lldbg-check:[...] 16
-// lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:v *u32_ref
 // lldbg-check:[...] 32
-// lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:v *u64_ref
 // lldbg-check:[...] 64
-// lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:v *f16_ref
 // lldbg-check:[...] 1.5
-// lldbr-check:(f16) *f16_ref = 1.5
 
 // lldb-command:v *f32_ref
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:v *f64_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-c-style-enum.rs b/tests/debuginfo/borrowed-c-style-enum.rs
index af932fad16a..6d771cf6792 100644
--- a/tests/debuginfo/borrowed-c-style-enum.rs
+++ b/tests/debuginfo/borrowed-c-style-enum.rs
@@ -20,15 +20,12 @@
 
 // lldb-command:v *the_a_ref
 // lldbg-check:[...] TheA
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
 
 // lldb-command:v *the_b_ref
 // lldbg-check:[...] TheB
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
 
 // lldb-command:v *the_c_ref
 // lldbg-check:[...] TheC
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-enum.rs b/tests/debuginfo/borrowed-enum.rs
index 2f69742f0d4..8782e28e4ec 100644
--- a/tests/debuginfo/borrowed-enum.rs
+++ b/tests/debuginfo/borrowed-enum.rs
@@ -22,13 +22,10 @@
 
 // lldb-command:v *the_a_ref
 // lldbg-check:(borrowed_enum::ABC) *the_a_ref = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
-// lldbr-check:(borrowed_enum::ABC::TheA) *the_a_ref = TheA { TheA: 0, TheB: 8970181431921507452 }
 // lldb-command:v *the_b_ref
 // lldbg-check:(borrowed_enum::ABC) *the_b_ref = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
-// lldbr-check:(borrowed_enum::ABC::TheB) *the_b_ref = { = 0 = 286331153 = 286331153 }
 // lldb-command:v *univariant_ref
 // lldbg-check:(borrowed_enum::Univariant) *univariant_ref = { value = { 0 = 4820353753753434 } }
-// lldbr-check:(borrowed_enum::Univariant) *univariant_ref = { TheOnlyCase = { = 4820353753753434 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-struct.rs b/tests/debuginfo/borrowed-struct.rs
index 6868290963c..e9b75146562 100644
--- a/tests/debuginfo/borrowed-struct.rs
+++ b/tests/debuginfo/borrowed-struct.rs
@@ -32,31 +32,24 @@
 
 // lldb-command:v *stack_val_ref
 // lldbg-check:[...] { x = 10 y = 23.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
 
 // lldb-command:v *stack_val_interior_ref_1
 // lldbg-check:[...] 10
-// lldbr-check:(isize) *stack_val_interior_ref_1 = 10
 
 // lldb-command:v *stack_val_interior_ref_2
 // lldbg-check:[...] 23.5
-// lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5
 
 // lldb-command:v *ref_to_unnamed
 // lldbg-check:[...] { x = 11 y = 24.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
 
 // lldb-command:v *unique_val_ref
 // lldbg-check:[...] { x = 13 y = 26.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
 
 // lldb-command:v *unique_val_interior_ref_1
 // lldbg-check:[...] 13
-// lldbr-check:(isize) *unique_val_interior_ref_1 = 13
 
 // lldb-command:v *unique_val_interior_ref_2
 // lldbg-check:[...] 26.5
-// lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs
index ec81e5b607b..720d6048f83 100644
--- a/tests/debuginfo/borrowed-tuple.rs
+++ b/tests/debuginfo/borrowed-tuple.rs
@@ -20,15 +20,12 @@
 
 // lldb-command:v *stack_val_ref
 // lldbg-check:[...] { 0 = -14 1 = -19 }
-// lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
 
 // lldb-command:v *ref_to_unnamed
 // lldbg-check:[...] { 0 = -15 1 = -20 }
-// lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
 
 // lldb-command:v *unique_val_ref
 // lldbg-check:[...] { 0 = -17 1 = -22 }
-// lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/borrowed-unique-basic.rs b/tests/debuginfo/borrowed-unique-basic.rs
index 2c4492e8eb2..8b2690e025b 100644
--- a/tests/debuginfo/borrowed-unique-basic.rs
+++ b/tests/debuginfo/borrowed-unique-basic.rs
@@ -58,62 +58,46 @@
 
 // lldb-command:v *bool_ref
 // lldbg-check:[...] true
-// lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:v *int_ref
 // lldbg-check:[...] -1
-// lldbr-check:(isize) *int_ref = -1
 
-// lldbr-command:print *char_ref
-// lldbr-check:(char) *char_ref = 97
 
 // lldb-command:v *i8_ref
 // lldbg-check:[...] 68
-// lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:v *i16_ref
 // lldbg-check:[...] -16
-// lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:v *i32_ref
 // lldbg-check:[...] -32
-// lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:v *i64_ref
 // lldbg-check:[...] -64
-// lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:v *uint_ref
 // lldbg-check:[...] 1
-// lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:v *u8_ref
 // lldbg-check:[...] 100
-// lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:v *u16_ref
 // lldbg-check:[...] 16
-// lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:v *u32_ref
 // lldbg-check:[...] 32
-// lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:v *u64_ref
 // lldbg-check:[...] 64
-// lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:v *f16_ref
 // lldbg-check:[...] 1.5
-// lldbr-check:(f16) *f16_ref = 1.5
 
 // lldb-command:v *f32_ref
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:v *f64_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/box.rs b/tests/debuginfo/box.rs
index 248d00687e8..40f0cd52444 100644
--- a/tests/debuginfo/box.rs
+++ b/tests/debuginfo/box.rs
@@ -15,10 +15,8 @@
 // lldb-command:run
 // lldb-command:v *a
 // lldbg-check:[...] 1
-// lldbr-check:(i32) *a = 1
 // lldb-command:v *b
 // lldbg-check:[...] { 0 = 2 1 = 3.5 }
-// lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/boxed-struct.rs b/tests/debuginfo/boxed-struct.rs
index c7a8a4bd3d1..b4349122a3a 100644
--- a/tests/debuginfo/boxed-struct.rs
+++ b/tests/debuginfo/boxed-struct.rs
@@ -17,11 +17,9 @@
 
 // lldb-command:v *boxed_with_padding
 // lldbg-check:[...] { x = 99 y = 999 z = 9999 w = 99999 }
-// lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 }
 
 // lldb-command:v *boxed_with_dtor
 // lldbg-check:[...] { x = 77 y = 777 z = 7777 w = 77777 }
-// lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
index e23b459a572..69a051b444d 100644
--- a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
@@ -23,17 +23,14 @@
 
 // lldb-command:v self
 // lldbg-check:[...] 1111
-// lldbr-check:(isize) self = 1111
 // lldb-command:continue
 
 // lldb-command:v self
 // lldbg-check:[...] { x = 2222 y = 3333 }
-// lldbr-check:(by_value_self_argument_in_trait_impl::Struct) self = { x = 2222 y = 3333 }
 // lldb-command:continue
 
 // lldb-command:v self
 // lldbg-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
-// lldbr-check:((f64, isize, isize, f64)) self = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs
index 5aaa8b8853a..4cd40c20ceb 100644
--- a/tests/debuginfo/c-style-enum-in-composite.rs
+++ b/tests/debuginfo/c-style-enum-in-composite.rs
@@ -31,31 +31,24 @@
 
 // lldb-command:v tuple_interior_padding
 // lldbg-check:[...] { 0 = 0 1 = OneHundred }
-// lldbr-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred }
 
 // lldb-command:v tuple_padding_at_end
 // lldbg-check:[...] { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
-// lldbr-check:(((u64, c_style_enum_in_composite::AnEnum), u64)) tuple_padding_at_end = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
 
 // lldb-command:v tuple_different_enums
 // lldbg-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
-// lldbr-check:((c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum, c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum)) tuple_different_enums = { 0 = c_style_enum_in_composite::AnEnum::OneThousand 1 = c_style_enum_in_composite::AnotherEnum::MountainView 2 = c_style_enum_in_composite::AnEnum::OneMillion 3 = c_style_enum_in_composite::AnotherEnum::Vienna }
 
 // lldb-command:v padded_struct
 // lldbg-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
-// lldbr-check:(c_style_enum_in_composite::PaddedStruct) padded_struct = { a = 3 b = c_style_enum_in_composite::AnEnum::OneMillion c = 4 d = Toronto e = 5 }
 
 // lldb-command:v packed_struct
 // lldbg-check:[...] { a = 6 b = OneHundred c = 7 d = Vienna e = 8 }
-// lldbr-check:(c_style_enum_in_composite::PackedStruct) packed_struct = { a = 6 b = c_style_enum_in_composite::AnEnum::OneHundred c = 7 d = Vienna e = 8 }
 
 // lldb-command:v non_padded_struct
 // lldbg-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto }
-// lldbr-check:(c_style_enum_in_composite::NonPaddedStruct) non_padded_struct = { a = c_style_enum_in_composite::AnEnum::OneMillion, b = c_style_enum_in_composite::AnotherEnum::MountainView, c = c_style_enum_in_composite::AnEnum::OneThousand, d = c_style_enum_in_composite::AnotherEnum::Toronto }
 
 // lldb-command:v struct_with_drop
 // lldbg-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 }
-// lldbr-check:((c_style_enum_in_composite::StructWithDrop, i64)) struct_with_drop = { 0 = { a = c_style_enum_in_composite::AnEnum::OneHundred b = c_style_enum_in_composite::AnotherEnum::Vienna } 1 = 9 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/c-style-enum.rs b/tests/debuginfo/c-style-enum.rs
index 471449af3dd..a148c8d3845 100644
--- a/tests/debuginfo/c-style-enum.rs
+++ b/tests/debuginfo/c-style-enum.rs
@@ -67,31 +67,24 @@
 
 // lldb-command:v auto_one
 // lldbg-check:[...] One
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_one = c_style_enum::AutoDiscriminant::One
 
 // lldb-command:v auto_two
 // lldbg-check:[...] Two
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_two = c_style_enum::AutoDiscriminant::Two
 
 // lldb-command:v auto_three
 // lldbg-check:[...] Three
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_three = c_style_enum::AutoDiscriminant::Three
 
 // lldb-command:v manual_one_hundred
 // lldbg-check:[...] OneHundred
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_hundred = c_style_enum::ManualDiscriminant::OneHundred
 
 // lldb-command:v manual_one_thousand
 // lldbg-check:[...] OneThousand
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_thousand = c_style_enum::ManualDiscriminant::OneThousand
 
 // lldb-command:v manual_one_million
 // lldbg-check:[...] OneMillion
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_million = c_style_enum::ManualDiscriminant::OneMillion
 
 // lldb-command:v single_variant
 // lldbg-check:[...] TheOnlyVariant
-// lldbr-check:(c_style_enum::SingleVariant) single_variant = c_style_enum::SingleVariant::TheOnlyVariant
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/closure-in-generic-function.rs b/tests/debuginfo/closure-in-generic-function.rs
index d4608dc284a..2baaf1b79e9 100644
--- a/tests/debuginfo/closure-in-generic-function.rs
+++ b/tests/debuginfo/closure-in-generic-function.rs
@@ -23,18 +23,14 @@
 
 // lldb-command:v x
 // lldbg-check:[...] 0.5
-// lldbr-check:(f64) x = 0.5
 // lldb-command:v y
 // lldbg-check:[...] 10
-// lldbr-check:(i32) y = 10
 // lldb-command:continue
 
 // lldb-command:v *x
 // lldbg-check:[...] 29
-// lldbr-check:(i32) *x = 29
 // lldb-command:v *y
 // lldbg-check:[...] 110
-// lldbr-check:(i32) *y = 110
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs
index 34e3daebb80..5e8b27d4d55 100644
--- a/tests/debuginfo/cross-crate-spans.rs
+++ b/tests/debuginfo/cross-crate-spans.rs
@@ -37,24 +37,18 @@ extern crate cross_crate_spans;
 
 // lldb-command:v result
 // lldbg-check:[...] { 0 = 17 1 = 17 }
-// lldbr-check:((u32, u32)) result = { 0 = 17 1 = 17 }
 // lldb-command:v a_variable
 // lldbg-check:[...] 123456789
-// lldbr-check:(u32) a_variable = 123456789
 // lldb-command:v another_variable
 // lldbg-check:[...] 123456789.5
-// lldbr-check:(f64) another_variable = 123456789.5
 // lldb-command:continue
 
 // lldb-command:v result
 // lldbg-check:[...] { 0 = 1212 1 = 1212 }
-// lldbr-check:((i16, i16)) result = { 0 = 1212 1 = 1212 }
 // lldb-command:v a_variable
 // lldbg-check:[...] 123456789
-// lldbr-check:(u32) a_variable = 123456789
 // lldb-command:v another_variable
 // lldbg-check:[...] 123456789.5
-// lldbr-check:(f64) another_variable = 123456789.5
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/destructured-fn-argument.rs b/tests/debuginfo/destructured-fn-argument.rs
index db86fe5b923..aef4e4baae1 100644
--- a/tests/debuginfo/destructured-fn-argument.rs
+++ b/tests/debuginfo/destructured-fn-argument.rs
@@ -155,195 +155,146 @@
 
 // lldb-command:v a
 // lldbg-check:[...] 1
-// lldbr-check:(isize) a = 1
 // lldb-command:v b
 // lldbg-check:[...] false
-// lldbr-check:(bool) b = false
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 2
-// lldbr-check:(isize) a = 2
 // lldb-command:v b
 // lldbg-check:[...] 3
-// lldbr-check:(u16) b = 3
 // lldb-command:v c
 // lldbg-check:[...] 4
-// lldbr-check:(u16) c = 4
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 5
-// lldbr-check:(isize) a = 5
 // lldb-command:v b
 // lldbg-check:[...] { 0 = 6 1 = 7 }
-// lldbr-check:((u32, u32)) b = { 0 = 6 1 = 7 }
 // lldb-command:continue
 
 // lldb-command:v h
 // lldbg-check:[...] 8
-// lldbr-check:(i16) h = 8
 // lldb-command:v i
 // lldbg-check:[...] { a = 9 b = 10 }
-// lldbr-check:(destructured_fn_argument::Struct) i = { a = 9 b = 10 }
 // lldb-command:v j
 // lldbg-check:[...] 11
-// lldbr-check:(i16) j = 11
 // lldb-command:continue
 
 // lldb-command:v k
 // lldbg-check:[...] 12
-// lldbr-check:(i64) k = 12
 // lldb-command:v l
 // lldbg-check:[...] 13
-// lldbr-check:(i32) l = 13
 // lldb-command:continue
 
 // lldb-command:v m
 // lldbg-check:[...] 14
-// lldbr-check:(isize) m = 14
 // lldb-command:v n
 // lldbg-check:[...] 16
-// lldbr-check:(i32) n = 16
 // lldb-command:continue
 
 // lldb-command:v o
 // lldbg-check:[...] 18
-// lldbr-check:(i32) o = 18
 // lldb-command:continue
 
 // lldb-command:v p
 // lldbg-check:[...] 19
-// lldbr-check:(i64) p = 19
 // lldb-command:v q
 // lldbg-check:[...] 20
-// lldbr-check:(i32) q = 20
 // lldb-command:v r
 // lldbg-check:[...] { a = 21 b = 22 }
-// lldbr-check:(destructured_fn_argument::Struct) r = { a = 21, b = 22 }
 // lldb-command:continue
 
 // lldb-command:v s
 // lldbg-check:[...] 24
-// lldbr-check:(i32) s = 24
 // lldb-command:v t
 // lldbg-check:[...] 23
-// lldbr-check:(i64) t = 23
 // lldb-command:continue
 
 // lldb-command:v u
 // lldbg-check:[...] 25
-// lldbr-check:(i16) u = 25
 // lldb-command:v v
 // lldbg-check:[...] 26
-// lldbr-check:(i32) v = 26
 // lldb-command:v w
 // lldbg-check:[...] 27
-// lldbr-check:(i64) w = 27
 // lldb-command:v x
 // lldbg-check:[...] 28
-// lldbr-check:(i32) x = 28
 // lldb-command:v y
 // lldbg-check:[...] 29
-// lldbr-check:(i64) y = 29
 // lldb-command:v z
 // lldbg-check:[...] 30
-// lldbr-check:(i32) z = 30
 // lldb-command:v ae
 // lldbg-check:[...] 31
-// lldbr-check:(i64) ae = 31
 // lldb-command:v oe
 // lldbg-check:[...] 32
-// lldbr-check:(i32) oe = 32
 // lldb-command:v ue
 // lldbg-check:[...] 33
-// lldbr-check:(u16) ue = 33
 // lldb-command:continue
 
 // lldb-command:v aa
 // lldbg-check:[...] { 0 = 34 1 = 35 }
-// lldbr-check:((isize, isize)) aa = { 0 = 34 1 = 35 }
 // lldb-command:continue
 
 // lldb-command:v bb
 // lldbg-check:[...] { 0 = 36 1 = 37 }
-// lldbr-check:((isize, isize)) bb = { 0 = 36 1 = 37 }
 // lldb-command:continue
 
 // lldb-command:v cc
 // lldbg-check:[...] 38
-// lldbr-check:(isize) cc = 38
 // lldb-command:continue
 
 // lldb-command:v dd
 // lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 }
-// lldbr-check:((isize, isize, isize)) dd = { 0 = 40 1 = 41 2 = 42 }
 // lldb-command:continue
 
 // lldb-command:v *ee
 // lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 }
-// lldbr-check:((isize, isize, isize)) *ee = { 0 = 43 1 = 44 2 = 45 }
 // lldb-command:continue
 
 // lldb-command:v *ff
 // lldbg-check:[...] 46
-// lldbr-check:(isize) *ff = 46
 // lldb-command:v gg
 // lldbg-check:[...] { 0 = 47 1 = 48 }
-// lldbr-check:((isize, isize)) gg = { 0 = 47 1 = 48 }
 // lldb-command:continue
 
 // lldb-command:v *hh
 // lldbg-check:[...] 50
-// lldbr-check:(i32) *hh = 50
 // lldb-command:continue
 
 // lldb-command:v ii
 // lldbg-check:[...] 51
-// lldbr-check:(i32) ii = 51
 // lldb-command:continue
 
 // lldb-command:v *jj
 // lldbg-check:[...] 52
-// lldbr-check:(i32) *jj = 52
 // lldb-command:continue
 
 // lldb-command:v kk
 // lldbg-check:[...] 53
-// lldbr-check:(f64) kk = 53
 // lldb-command:v ll
 // lldbg-check:[...] 54
-// lldbr-check:(isize) ll = 54
 // lldb-command:continue
 
 // lldb-command:v mm
 // lldbg-check:[...] 55
-// lldbr-check:(f64) mm = 55
 // lldb-command:v *nn
 // lldbg-check:[...] 56
-// lldbr-check:(isize) *nn = 56
 // lldb-command:continue
 
 // lldb-command:v oo
 // lldbg-check:[...] 57
-// lldbr-check:(isize) oo = 57
 // lldb-command:v pp
 // lldbg-check:[...] 58
-// lldbr-check:(isize) pp = 58
 // lldb-command:v qq
 // lldbg-check:[...] 59
-// lldbr-check:(isize) qq = 59
 // lldb-command:continue
 
 // lldb-command:v rr
 // lldbg-check:[...] 60
-// lldbr-check:(isize) rr = 60
 // lldb-command:v ss
 // lldbg-check:[...] 61
-// lldbr-check:(isize) ss = 61
 // lldb-command:v tt
 // lldbg-check:[...] 62
-// lldbr-check:(isize) tt = 62
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs
index 73f03ec40b6..6a43f8ca199 100644
--- a/tests/debuginfo/destructured-for-loop-variable.rs
+++ b/tests/debuginfo/destructured-for-loop-variable.rs
@@ -78,89 +78,65 @@
 // DESTRUCTURED STRUCT
 // lldb-command:v x
 // lldbg-check:[...] 400
-// lldbr-check:(i16) x = 400
 // lldb-command:v y
 // lldbg-check:[...] 401.5
-// lldbr-check:(f32) y = 401.5
 // lldb-command:v z
 // lldbg-check:[...] true
-// lldbr-check:(bool) z = true
 // lldb-command:continue
 
 // DESTRUCTURED TUPLE
 // lldb-command:v _i8
 // lldbg-check:[...] 0x6f
-// lldbr-check:(i8) _i8 = 111
 // lldb-command:v _u8
 // lldbg-check:[...] 0x70
-// lldbr-check:(u8) _u8 = 112
 // lldb-command:v _i16
 // lldbg-check:[...] -113
-// lldbr-check:(i16) _i16 = -113
 // lldb-command:v _u16
 // lldbg-check:[...] 114
-// lldbr-check:(u16) _u16 = 114
 // lldb-command:v _i32
 // lldbg-check:[...] -115
-// lldbr-check:(i32) _i32 = -115
 // lldb-command:v _u32
 // lldbg-check:[...] 116
-// lldbr-check:(u32) _u32 = 116
 // lldb-command:v _i64
 // lldbg-check:[...] -117
-// lldbr-check:(i64) _i64 = -117
 // lldb-command:v _u64
 // lldbg-check:[...] 118
-// lldbr-check:(u64) _u64 = 118
 // lldb-command:v _f32
 // lldbg-check:[...] 119.5
-// lldbr-check:(f32) _f32 = 119.5
 // lldb-command:v _f64
 // lldbg-check:[...] 120.5
-// lldbr-check:(f64) _f64 = 120.5
 // lldb-command:continue
 
 // MORE COMPLEX CASE
 // lldb-command:v v1
 // lldbg-check:[...] 80000
-// lldbr-check:(i32) v1 = 80000
 // lldb-command:v x1
 // lldbg-check:[...] 8000
-// lldbr-check:(i16) x1 = 8000
 // lldb-command:v *y1
 // lldbg-check:[...] 80001.5
-// lldbr-check:(f32) *y1 = 80001.5
 // lldb-command:v z1
 // lldbg-check:[...] false
-// lldbr-check:(bool) z1 = false
 // lldb-command:v *x2
 // lldbg-check:[...] -30000
-// lldbr-check:(i16) *x2 = -30000
 // lldb-command:v y2
 // lldbg-check:[...] -300001.5
-// lldbr-check:(f32) y2 = -300001.5
 // lldb-command:v *z2
 // lldbg-check:[...] true
-// lldbr-check:(bool) *z2 = true
 // lldb-command:v v2
 // lldbg-check:[...] 854237.5
-// lldbr-check:(f64) v2 = 854237.5
 // lldb-command:continue
 
 // SIMPLE IDENTIFIER
 // lldb-command:v i
 // lldbg-check:[...] 1234
-// lldbr-check:(i32) i = 1234
 // lldb-command:continue
 
 // lldb-command:v simple_struct_ident
 // lldbg-check:[...] { x = 3537 y = 35437.5 z = true }
-// lldbr-check:(destructured_for_loop_variable::Struct) simple_struct_ident = { x = 3537 y = 35437.5 z = true }
 // lldb-command:continue
 
 // lldb-command:v simple_tuple_ident
 // lldbg-check:[...] { 0 = 34903493 1 = 232323 }
-// lldbr-check:((u32, i64)) simple_tuple_ident = { 0 = 34903493 1 = 232323 }
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs
index f4d960f7881..b74bf8745ea 100644
--- a/tests/debuginfo/destructured-local.rs
+++ b/tests/debuginfo/destructured-local.rs
@@ -121,156 +121,113 @@
 
 // lldb-command:v a
 // lldbg-check:[...] 1
-// lldbr-check:(isize) a = 1
 // lldb-command:v b
 // lldbg-check:[...] false
-// lldbr-check:(bool) b = false
 
 // lldb-command:v c
 // lldbg-check:[...] 2
-// lldbr-check:(isize) c = 2
 // lldb-command:v d
 // lldbg-check:[...] 3
-// lldbr-check:(u16) d = 3
 // lldb-command:v e
 // lldbg-check:[...] 4
-// lldbr-check:(u16) e = 4
 
 // lldb-command:v f
 // lldbg-check:[...] 5
-// lldbr-check:(isize) f = 5
 // lldb-command:v g
 // lldbg-check:[...] { 0 = 6 1 = 7 }
-// lldbr-check:((u32, u32)) g = { 0 = 6 1 = 7 }
 
 // lldb-command:v h
 // lldbg-check:[...] 8
-// lldbr-check:(i16) h = 8
 // lldb-command:v i
 // lldbg-check:[...] { a = 9 b = 10 }
-// lldbr-check:(destructured_local::Struct) i = { a = 9 b = 10 }
 // lldb-command:v j
 // lldbg-check:[...] 11
-// lldbr-check:(i16) j = 11
 
 // lldb-command:v k
 // lldbg-check:[...] 12
-// lldbr-check:(i64) k = 12
 // lldb-command:v l
 // lldbg-check:[...] 13
-// lldbr-check:(i32) l = 13
 
 // lldb-command:v m
 // lldbg-check:[...] 14
-// lldbr-check:(i32) m = 14
 // lldb-command:v n
 // lldbg-check:[...] 16
-// lldbr-check:(i32) n = 16
 
 // lldb-command:v o
 // lldbg-check:[...] 18
-// lldbr-check:(i32) o = 18
 
 // lldb-command:v p
 // lldbg-check:[...] 19
-// lldbr-check:(i64) p = 19
 // lldb-command:v q
 // lldbg-check:[...] 20
-// lldbr-check:(i32) q = 20
 // lldb-command:v r
 // lldbg-check:[...] { a = 21 b = 22 }
-// lldbr-check:(destructured_local::Struct) r = { a = 21 b = 22 }
 
 // lldb-command:v s
 // lldbg-check:[...] 24
-// lldbr-check:(i32) s = 24
 // lldb-command:v t
 // lldbg-check:[...] 23
-// lldbr-check:(i64) t = 23
 
 // lldb-command:v u
 // lldbg-check:[...] 25
-// lldbr-check:(i32) u = 25
 // lldb-command:v v
 // lldbg-check:[...] 26
-// lldbr-check:(i32) v = 26
 // lldb-command:v w
 // lldbg-check:[...] 27
-// lldbr-check:(i32) w = 27
 // lldb-command:v x
 // lldbg-check:[...] 28
-// lldbr-check:(i32) x = 28
 // lldb-command:v y
 // lldbg-check:[...] 29
-// lldbr-check:(i64) y = 29
 // lldb-command:v z
 // lldbg-check:[...] 30
-// lldbr-check:(i32) z = 30
 // lldb-command:v ae
 // lldbg-check:[...] 31
-// lldbr-check:(i64) ae = 31
 // lldb-command:v oe
 // lldbg-check:[...] 32
-// lldbr-check:(i32) oe = 32
 // lldb-command:v ue
 // lldbg-check:[...] 33
-// lldbr-check:(i32) ue = 33
 
 // lldb-command:v aa
 // lldbg-check:[...] { 0 = 34 1 = 35 }
-// lldbr-check:((i32, i32)) aa = { 0 = 34 1 = 35 }
 
 // lldb-command:v bb
 // lldbg-check:[...] { 0 = 36 1 = 37 }
-// lldbr-check:((i32, i32)) bb = { 0 = 36 1 = 37 }
 
 // lldb-command:v cc
 // lldbg-check:[...] 38
-// lldbr-check:(i32) cc = 38
 
 // lldb-command:v dd
 // lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 }
-// lldbr-check:((i32, i32, i32)) dd = { 0 = 40 1 = 41 2 = 42}
 
 // lldb-command:v *ee
 // lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 }
-// lldbr-check:((i32, i32, i32)) *ee = { 0 = 43 1 = 44 2 = 45}
 
 // lldb-command:v *ff
 // lldbg-check:[...] 46
-// lldbr-check:(i32) *ff = 46
 
 // lldb-command:v gg
 // lldbg-check:[...] { 0 = 47 1 = 48 }
-// lldbr-check:((i32, i32)) gg = { 0 = 47 1 = 48 }
 
 // lldb-command:v *hh
 // lldbg-check:[...] 50
-// lldbr-check:(i32) *hh = 50
 
 // lldb-command:v ii
 // lldbg-check:[...] 51
-// lldbr-check:(i32) ii = 51
 
 // lldb-command:v *jj
 // lldbg-check:[...] 52
-// lldbr-check:(i32) *jj = 52
 
 // lldb-command:v kk
 // lldbg-check:[...] 53
-// lldbr-check:(f64) kk = 53
 
 // lldb-command:v ll
 // lldbg-check:[...] 54
-// lldbr-check:(isize) ll = 54
 
 // lldb-command:v mm
 // lldbg-check:[...] 55
-// lldbr-check:(f64) mm = 55
 
 // lldb-command:v *nn
 // lldbg-check:[...] 56
-// lldbr-check:(isize) *nn = 56
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/enum-thinlto.rs b/tests/debuginfo/enum-thinlto.rs
index d30ff7dde38..8c3a20a2da4 100644
--- a/tests/debuginfo/enum-thinlto.rs
+++ b/tests/debuginfo/enum-thinlto.rs
@@ -14,7 +14,6 @@
 
 // lldb-command:v *abc
 // lldbg-check:(enum_thinlto::ABC) *abc = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
-// lldbr-check:(enum_thinlto::ABC) *abc = (x = 0, y = 8970181431921507452)
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/evec-in-struct.rs b/tests/debuginfo/evec-in-struct.rs
index f09471e7530..020c6e7d154 100644
--- a/tests/debuginfo/evec-in-struct.rs
+++ b/tests/debuginfo/evec-in-struct.rs
@@ -25,22 +25,17 @@
 
 // lldb-command:v no_padding1
 // lldbg-check:[...] { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } }
-// lldbr-check:(evec_in_struct::NoPadding1) no_padding1 = { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } }
 // lldb-command:v no_padding2
 // lldbg-check:[...] { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } }
-// lldbr-check:(evec_in_struct::NoPadding2) no_padding2 = { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } }
 
 // lldb-command:v struct_internal_padding
 // lldbg-check:[...] { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } }
-// lldbr-check:(evec_in_struct::StructInternalPadding) struct_internal_padding = { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } }
 
 // lldb-command:v single_vec
 // lldbg-check:[...] { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } }
-// lldbr-check:(evec_in_struct::SingleVec) single_vec = { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } }
 
 // lldb-command:v struct_padded_at_end
 // lldbg-check:[...] { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } }
-// lldbr-check:(evec_in_struct::StructPaddedAtEnd) struct_padded_at_end = { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/extern-c-fn.rs b/tests/debuginfo/extern-c-fn.rs
index 0531d746188..d81ab356c1e 100644
--- a/tests/debuginfo/extern-c-fn.rs
+++ b/tests/debuginfo/extern-c-fn.rs
@@ -21,16 +21,12 @@
 
 // lldb-command:v len
 // lldbg-check:[...] 20
-// lldbr-check:(i32) len = 20
 // lldb-command:v local0
 // lldbg-check:[...] 19
-// lldbr-check:(i32) local0 = 19
 // lldb-command:v local1
 // lldbg-check:[...] true
-// lldbr-check:(bool) local1 = true
 // lldb-command:v local2
 // lldbg-check:[...] 20.5
-// lldbr-check:(f64) local2 = 20.5
 
 // lldb-command:continue
 
diff --git a/tests/debuginfo/function-arguments.rs b/tests/debuginfo/function-arguments.rs
index bbf397caacd..9befadf5dc1 100644
--- a/tests/debuginfo/function-arguments.rs
+++ b/tests/debuginfo/function-arguments.rs
@@ -22,18 +22,14 @@
 
 // lldb-command:v x
 // lldbg-check:[...] 111102
-// lldbr-check:(isize) x = 111102
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 2000
-// lldbr-check:(i32) a = 2000
 // lldb-command:v b
 // lldbg-check:[...] 3000
-// lldbr-check:(i64) b = 3000
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/generic-function.rs b/tests/debuginfo/generic-function.rs
index 6c1d0d5d7db..47f695b8fbe 100644
--- a/tests/debuginfo/generic-function.rs
+++ b/tests/debuginfo/generic-function.rs
@@ -28,26 +28,20 @@
 
 // lldb-command:v *t0
 // lldbg-check:[...] 1
-// lldbr-check:(i32) *t0 = 1
 // lldb-command:v *t1
 // lldbg-check:[...] 2.5
-// lldbr-check:(f64) *t1 = 2.5
 // lldb-command:continue
 
 // lldb-command:v *t0
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *t0 = 3.5
 // lldb-command:v *t1
 // lldbg-check:[...] 4
-// lldbr-check:(u16) *t1 = 4
 // lldb-command:continue
 
 // lldb-command:v *t0
 // lldbg-check:[...] 5
-// lldbr-check:(i32) *t0 = 5
 // lldb-command:v *t1
 // lldbg-check:[...] { a = 6 b = 7.5 }
-// lldbr-check:(generic_function::Struct) *t1 = { a = 6 b = 7.5 }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/generic-functions-nested.rs b/tests/debuginfo/generic-functions-nested.rs
index 1aac6591738..500a42f3dc8 100644
--- a/tests/debuginfo/generic-functions-nested.rs
+++ b/tests/debuginfo/generic-functions-nested.rs
@@ -35,34 +35,26 @@
 
 // lldb-command:v x
 // lldbg-check:[...] -1
-// lldbr-check:(i32) x = -1
 // lldb-command:v y
 // lldbg-check:[...] 1
-// lldbr-check:(i32) y = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -1
-// lldbr-check:(i32) x = -1
 // lldb-command:v y
 // lldbg-check:[...] 2.5
-// lldbr-check:(f64) y = 2.5
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -2.5
-// lldbr-check:(f64) x = -2.5
 // lldb-command:v y
 // lldbg-check:[...] 1
-// lldbr-check:(i32) y = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -2.5
-// lldbr-check:(f64) x = -2.5
 // lldb-command:v y
 // lldbg-check:[...] 2.5
-// lldbr-check:(f64) y = 2.5
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/generic-method-on-generic-struct.rs b/tests/debuginfo/generic-method-on-generic-struct.rs
index 0f72e2b092b..071d436b089 100644
--- a/tests/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
@@ -1,9 +1,5 @@
 //@ compile-flags:-g
 
-// Some versions of the non-rust-enabled LLDB print the wrong generic
-// parameter type names in this test.
-//@ needs-rust-lldb
-
 // === GDB TESTS ===================================================================================
 
 // gdb-command:run
@@ -61,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } }
-// lldbr-check:(generic_method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { 0 = 8888 1 = -8888 } }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] 2
-// lldbr-check:(u16) arg2 = 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } }
-// lldbr-check:(generic_method_on_generic_struct::Struct<(u32, i32)>) self = { x = { 0 = 8888, 1 = -8888 } }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(i16) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 1234.5 }
-// lldbr-check:(generic_method_on_generic_struct::Struct<f64>) *self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(i32) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 1234.5 }
-// lldbr-check:(generic_method_on_generic_struct::Struct<f64>) self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(i64) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { x = 1234.5 }
-// lldbr-check:(generic_method_on_generic_struct::Struct<f64>) *self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10.5
-// lldbr-check:(f32) arg2 = -10.5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs
index 2817f8edc15..49ec4ac1c17 100644
--- a/tests/debuginfo/generic-struct.rs
+++ b/tests/debuginfo/generic-struct.rs
@@ -19,17 +19,13 @@
 
 // lldb-command:v int_int
 // lldbg-check:[...] AGenericStruct<i32, i32> { key: 0, value: 1 }
-// lldbr-check:(generic_struct::AGenericStruct<i32, i32>) int_int = AGenericStruct<i32, i32> { key: 0, value: 1 }
 // lldb-command:v int_float
 // lldbg-check:[...] AGenericStruct<i32, f64> { key: 2, value: 3.5 }
-// lldbr-check:(generic_struct::AGenericStruct<i32, f64>) int_float = AGenericStruct<i32, f64> { key: 2, value: 3.5 }
 // lldb-command:v float_int
 // lldbg-check:[...] AGenericStruct<f64, i32> { key: 4.5, value: 5 }
-// lldbr-check:(generic_struct::AGenericStruct<f64, i32>) float_int = AGenericStruct<f64, i32> { key: 4.5, value: 5 }
 
 // lldb-command:v float_int_float
 // lldbg-check:[...] AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
-// lldbr-check:(generic_struct::AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>>) float_int_float = AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/generic-tuple-style-enum.rs b/tests/debuginfo/generic-tuple-style-enum.rs
index 15b9cec071a..4a5996645cb 100644
--- a/tests/debuginfo/generic-tuple-style-enum.rs
+++ b/tests/debuginfo/generic-tuple-style-enum.rs
@@ -23,16 +23,12 @@
 // lldb-command:run
 
 // lldb-command:v case1
-// lldbr-check:(generic_tuple_style_enum::Regular<u16, u32, u64>::Case1) case1 = { __0 = 0 __1 = 31868 __2 = 31868 __3 = 31868 __4 = 31868 }
 
 // lldb-command:v case2
-// lldbr-check:(generic_tuple_style_enum::Regular<i16, i32, i64>::Case2) case2 = Regular<i16, i32, i64>::Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 }
 
 // lldb-command:v case3
-// lldbr-check:(generic_tuple_style_enum::Regular<i16, i32, i64>::Case3) case3 = Regular<i16, i32, i64>::Case3 { Case1: 0, Case2: 6438275382588823897 }
 
 // lldb-command:v univariant
-// lldbr-check:(generic_tuple_style_enum::Univariant<i64>) univariant = Univariant<i64> { TheOnlyCase: Univariant<i64>::TheOnlyCase(-1) }
 
 #![feature(omit_gdb_pretty_printer_section)]
 #![omit_gdb_pretty_printer_section]
diff --git a/tests/debuginfo/include_string.rs b/tests/debuginfo/include_string.rs
index 3ee02c554cb..5bf7cb69cc1 100644
--- a/tests/debuginfo/include_string.rs
+++ b/tests/debuginfo/include_string.rs
@@ -18,13 +18,10 @@
 
 // lldb-command:v string1.length
 // lldbg-check:[...] 48
-// lldbr-check:(usize) length = 48
 // lldb-command:v string2.length
 // lldbg-check:[...] 49
-// lldbr-check:(usize) length = 49
 // lldb-command:v string3.length
 // lldbg-check:[...] 50
-// lldbr-check:(usize) length = 50
 
 // lldb-command:continue
 
diff --git a/tests/debuginfo/issue-22656.rs b/tests/debuginfo/issue-22656.rs
index 199de531d0b..5198d34c7b8 100644
--- a/tests/debuginfo/issue-22656.rs
+++ b/tests/debuginfo/issue-22656.rs
@@ -11,11 +11,8 @@
 
 // lldb-command:v v
 // lldbg-check:[...] size=3 { [0] = 1 [1] = 2 [2] = 3 }
-// lldbr-check:(alloc::vec::Vec<i32>) v = size=3 { [0] = 1 [1] = 2 [2] = 3 }
 // lldb-command:v zs
 // lldbg-check:[...] { x = y = 123 z = w = 456 }
-// lldbr-check:(issue_22656::StructWithZeroSizedField) zs = { x = y = 123 z = w = 456 }
-// lldbr-command:continue
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/lexical-scope-in-for-loop.rs b/tests/debuginfo/lexical-scope-in-for-loop.rs
index d5594b6bc62..acfddaab89c 100644
--- a/tests/debuginfo/lexical-scope-in-for-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-for-loop.rs
@@ -44,40 +44,33 @@
 // FIRST ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 1
-// lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -1
-// lldbr-check:(i32) x = -1
 // lldb-command:continue
 
 // SECOND ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 2
-// lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -2
-// lldbr-check:(i32) x = -2
 // lldb-command:continue
 
 // THIRD ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 3
-// lldbr-check:(i32) x = 3
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -3
-// lldbr-check:(i32) x = -3
 // lldb-command:continue
 
 // AFTER LOOP
 // lldb-command:v x
 // lldbg-check:[...] 1000000
-// lldbr-check:(i32) x = 1000000
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-if.rs b/tests/debuginfo/lexical-scope-in-if.rs
index e35eb3715a9..d1c5884843c 100644
--- a/tests/debuginfo/lexical-scope-in-if.rs
+++ b/tests/debuginfo/lexical-scope-in-if.rs
@@ -68,73 +68,57 @@
 // BEFORE if
 // lldb-command:v x
 // lldbg-check:[...] 999
-// lldbr-check:(i32) x = 999
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AT BEGINNING of 'then' block
 // lldb-command:v x
 // lldbg-check:[...] 999
-// lldbr-check:(i32) x = 999
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AFTER 1st redeclaration of 'x'
 // lldb-command:v x
 // lldbg-check:[...] 1001
-// lldbr-check:(i32) x = 1001
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AFTER 2st redeclaration of 'x'
 // lldb-command:v x
 // lldbg-check:[...] 1002
-// lldbr-check:(i32) x = 1002
 // lldb-command:v y
 // lldbg-check:[...] 1003
-// lldbr-check:(i32) y = 1003
 // lldb-command:continue
 
 // AFTER 1st if expression
 // lldb-command:v x
 // lldbg-check:[...] 999
-// lldbr-check:(i32) x = 999
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
 // lldbg-check:[...] 999
-// lldbr-check:(i32) x = 999
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
 // lldbg-check:[...] 1004
-// lldbr-check:(i32) x = 1004
 // lldb-command:v y
 // lldbg-check:[...] 1005
-// lldbr-check:(i32) y = 1005
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
 // lldbg-check:[...] 999
-// lldbr-check:(i32) x = 999
 // lldb-command:v y
 // lldbg-check:[...] -1
-// lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-match.rs b/tests/debuginfo/lexical-scope-in-match.rs
index cffda426aef..754616b1a54 100644
--- a/tests/debuginfo/lexical-scope-in-match.rs
+++ b/tests/debuginfo/lexical-scope-in-match.rs
@@ -63,72 +63,54 @@
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 231
-// lldbr-check:(i32) shadowed = 231
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 233
-// lldbr-check:(i32) shadowed = 233
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:v local_to_arm
 // lldbg-check:[...] 234
-// lldbr-check:(i32) local_to_arm = 234
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 236
-// lldbr-check:(i32) shadowed = 236
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 237
-// lldbr-check:(isize) shadowed = 237
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:v local_to_arm
 // lldbg-check:[...] 238
-// lldbr-check:(isize) local_to_arm = 238
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 239
-// lldbr-check:(isize) shadowed = 239
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 241
-// lldbr-check:(isize) shadowed = 241
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 243
-// lldbr-check:(i32) shadowed = 243
 // lldb-command:v *local_to_arm
 // lldbg-check:[...] 244
-// lldbr-check:(i32) *local_to_arm = 244
 // lldb-command:continue
 
 // lldb-command:v shadowed
 // lldbg-check:[...] 231
-// lldbr-check:(i32) shadowed = 231
 // lldb-command:v not_shadowed
 // lldbg-check:[...] 232
-// lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-stack-closure.rs b/tests/debuginfo/lexical-scope-in-stack-closure.rs
index 51fb16c594f..301423080e6 100644
--- a/tests/debuginfo/lexical-scope-in-stack-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-stack-closure.rs
@@ -35,32 +35,26 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 1000
-// lldbr-check:(isize) x = 1000
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2.5
-// lldbr-check:(f64) x = 2.5
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] true
-// lldbr-check:(bool) x = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
index 344e1893c86..1d111dab5c9 100644
--- a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
@@ -67,69 +67,56 @@
 // FIRST ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 0
-// lldbr-check:(i32) x = 0
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 1
-// lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -987
-// lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 1
-// lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2
-// lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -987
-// lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2
-// lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-unique-closure.rs b/tests/debuginfo/lexical-scope-in-unique-closure.rs
index 443c4209b75..d6cf39c77ae 100644
--- a/tests/debuginfo/lexical-scope-in-unique-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-unique-closure.rs
@@ -35,32 +35,26 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 1000
-// lldbr-check:(isize) x = 1000
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2.5
-// lldbr-check:(f64) x = 2.5
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] true
-// lldbr-check:(bool) x = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/lexical-scope-in-while.rs b/tests/debuginfo/lexical-scope-in-while.rs
index 864900711a9..faef8b44a29 100644
--- a/tests/debuginfo/lexical-scope-in-while.rs
+++ b/tests/debuginfo/lexical-scope-in-while.rs
@@ -67,69 +67,56 @@
 // FIRST ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 0
-// lldbr-check:(i32) x = 0
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 1
-// lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -987
-// lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 101
-// lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:v x
 // lldbg-check:[...] 1
-// lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2
-// lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] -987
-// lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 102
-// lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 2
-// lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-with-macro.rs b/tests/debuginfo/lexical-scope-with-macro.rs
index 6e8f87cc2d7..5f8838c782b 100644
--- a/tests/debuginfo/lexical-scope-with-macro.rs
+++ b/tests/debuginfo/lexical-scope-with-macro.rs
@@ -55,34 +55,26 @@
 
 // lldb-command:v a
 // lldbg-check:[...] 10
-// lldbr-check:(i32) a = 10
 // lldb-command:v b
 // lldbg-check:[...] 34
-// lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 890242
-// lldbr-check:(i32) a = 10
 // lldb-command:v b
 // lldbg-check:[...] 34
-// lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 10
-// lldbr-check:(i32) a = 10
 // lldb-command:v b
 // lldbg-check:[...] 34
-// lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 102
-// lldbr-check:(i32) a = 10
 // lldb-command:v b
 // lldbg-check:[...] 34
-// lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldbg-command:print a
diff --git a/tests/debuginfo/lexical-scopes-in-block-expression.rs b/tests/debuginfo/lexical-scopes-in-block-expression.rs
index 310e9ae2a93..f90c3dd327b 100644
--- a/tests/debuginfo/lexical-scopes-in-block-expression.rs
+++ b/tests/debuginfo/lexical-scopes-in-block-expression.rs
@@ -184,202 +184,154 @@
 // STRUCT EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 11
-// lldbr-check:(isize) val = 11
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // FUNCTION CALL
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 12
-// lldbr-check:(isize) val = 12
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // TUPLE EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 13
-// lldbr-check:(isize) val = 13
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // VEC EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 14
-// lldbr-check:(isize) val = 14
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // REPEAT VEC EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 15
-// lldbr-check:(isize) val = 15
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // ASSIGNMENT EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 16
-// lldbr-check:(isize) val = 16
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 
 // ARITHMETIC EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 17
-// lldbr-check:(isize) val = 17
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // INDEX EXPRESSION
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] 18
-// lldbr-check:(isize) val = 18
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:v val
 // lldbg-check:[...] -1
-// lldbr-check:(i32) val = -1
 // lldb-command:v ten
 // lldbg-check:[...] 10
-// lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index 8c2c6a38c26..27e83cbbe22 100644
--- a/tests/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
-// lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { = 8888 = -8888 } }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] -2
-// lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
-// lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) self = { x = { = 8888 = -8888 } }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] Struct<f64> { x: 1234.5 }
-// lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] Struct<f64> { x: 1234.5 }
-// lldbr-check:(method_on_generic_struct::Struct<f64>) self = Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] Struct<f64> { x: 1234.5 }
-// lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10
-// lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-struct.rs b/tests/debuginfo/method-on-struct.rs
index d92259b7ab1..307c6d92d48 100644
--- a/tests/debuginfo/method-on-struct.rs
+++ b/tests/debuginfo/method-on-struct.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(method_on_struct::Struct) *self = Struct { x: 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] -2
-// lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(method_on_struct::Struct) self = Struct { x: 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_struct::Struct) self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10
-// lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-trait.rs b/tests/debuginfo/method-on-trait.rs
index b4ff61b38b0..29087da0e6a 100644
--- a/tests/debuginfo/method-on-trait.rs
+++ b/tests/debuginfo/method-on-trait.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(method_on_trait::Struct) *self = { x = 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] -2
-// lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(method_on_trait::Struct) self = { x = 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_trait::Struct) *self = { x = 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_trait::Struct) self = { x = 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(method_on_trait::Struct) *self = { x = 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10
-// lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-tuple-struct.rs b/tests/debuginfo/method-on-tuple-struct.rs
index 0a4beecb067..7b8d30abf63 100644
--- a/tests/debuginfo/method-on-tuple-struct.rs
+++ b/tests/debuginfo/method-on-tuple-struct.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { 0 = 100 1 = -100.5 }
-// lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 100 1 = -100.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] -2
-// lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { 0 = 100 1 = -100.5 }
-// lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 100 1 = -100.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { 0 = 200 1 = -200.5 }
-// lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { 0 = 200 1 = -200.5 }
-// lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { 0 = 200 1 = -200.5 }
-// lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10
-// lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/multi-cgu.rs b/tests/debuginfo/multi-cgu.rs
index 69460c40e62..81735f2bc09 100644
--- a/tests/debuginfo/multi-cgu.rs
+++ b/tests/debuginfo/multi-cgu.rs
@@ -22,12 +22,10 @@
 
 // lldb-command:v xxx
 // lldbg-check:[...] 12345
-// lldbr-check:(u32) xxx = 12345
 // lldb-command:continue
 
 // lldb-command:v yyy
 // lldbg-check:[...] 67890
-// lldbr-check:(u64) yyy = 67890
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/multiple-functions-equal-var-names.rs b/tests/debuginfo/multiple-functions-equal-var-names.rs
index 8ea3d5df2b0..cbf513ad0f7 100644
--- a/tests/debuginfo/multiple-functions-equal-var-names.rs
+++ b/tests/debuginfo/multiple-functions-equal-var-names.rs
@@ -22,17 +22,14 @@
 
 // lldb-command:v abc
 // lldbg-check:[...] 10101
-// lldbr-check:(i32) abc = 10101
 // lldb-command:continue
 
 // lldb-command:v abc
 // lldbg-check:[...] 20202
-// lldbr-check:(i32) abc = 20202
 // lldb-command:continue
 
 // lldb-command:v abc
 // lldbg-check:[...] 30303
-// lldbr-check:(i32) abc = 30303
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/multiple-functions.rs b/tests/debuginfo/multiple-functions.rs
index c1a357499f0..a113ce17855 100644
--- a/tests/debuginfo/multiple-functions.rs
+++ b/tests/debuginfo/multiple-functions.rs
@@ -22,17 +22,14 @@
 
 // lldb-command:v a
 // lldbg-check:[...] 10101
-// lldbr-check:(i32) a = 10101
 // lldb-command:continue
 
 // lldb-command:v b
 // lldbg-check:[...] 20202
-// lldbr-check:(i32) b = 20202
 // lldb-command:continue
 
 // lldb-command:v c
 // lldbg-check:[...] 30303
-// lldbr-check:(i32) c = 30303
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/name-shadowing-and-scope-nesting.rs b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
index 1a46a2d3890..9d1accd963b 100644
--- a/tests/debuginfo/name-shadowing-and-scope-nesting.rs
+++ b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
@@ -47,50 +47,38 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] true
-// lldbr-check:(bool) x = true
 // lldb-command:v y
 // lldbg-check:[...] 2220
-// lldbr-check:(i32) y = 2220
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 203203.5
-// lldbr-check:(f64) x = 203203.5
 // lldb-command:v y
 // lldbg-check:[...] 2220
-// lldbr-check:(i32) y = 2220
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/packed-struct-with-destructor.rs b/tests/debuginfo/packed-struct-with-destructor.rs
index a7683781b70..f715fdaea6f 100644
--- a/tests/debuginfo/packed-struct-with-destructor.rs
+++ b/tests/debuginfo/packed-struct-with-destructor.rs
@@ -36,35 +36,27 @@
 
 // lldb-command:v packed
 // lldbg-check:[...] { x = 123 y = 234 z = 345 }
-// lldbr-check:(packed_struct_with_destructor::Packed) packed = { x = 123 y = 234 z = 345 }
 
 // lldb-command:v packedInPacked
 // lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
-// lldbr-check:(packed_struct_with_destructor::PackedInPacked) packedInPacked = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
 
 // lldb-command:v packedInUnpacked
 // lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
-// lldbr-check:(packed_struct_with_destructor::PackedInUnpacked) packedInUnpacked = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
 
 // lldb-command:v unpackedInPacked
 // lldbg-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 }
-// lldbr-check:(packed_struct_with_destructor::UnpackedInPacked) unpackedInPacked = { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 }
 
 // lldb-command:v packedInPackedWithDrop
 // lldbg-check:[...] { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } }
-// lldbr-check:(packed_struct_with_destructor::PackedInPackedWithDrop) packedInPackedWithDrop = { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } }
 
 // lldb-command:v packedInUnpackedWithDrop
 // lldbg-check:[...] { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } }
-// lldbr-check:(packed_struct_with_destructor::PackedInUnpackedWithDrop) packedInUnpackedWithDrop = { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } }
 
 // lldb-command:v unpackedInPackedWithDrop
 // lldbg-check:[...] { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 }
-// lldbr-check:(packed_struct_with_destructor::UnpackedInPackedWithDrop) unpackedInPackedWithDrop = { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 }
 
 // lldb-command:v deeplyNested
 // lldbg-check:[...] { a = { a = 1 b = { x = 2 y = 3 z = 4 } c = 5 d = { x = 6 y = 7 z = 8 } } b = { a = 9 b = { x = 10 y = 11 z = 12 } c = { x = 13 y = 14 z = 15 } d = 16 } c = { a = 17 b = { x = 18 y = 19 z = 20 } c = 21 d = { x = 22 y = 23 z = 24 } } d = { a = 25 b = { x = 26 y = 27 z = 28 } c = 29 d = { x = 30 y = 31 z = 32 } } e = { a = 33 b = { x = 34 y = 35 z = 36 } c = { x = 37 y = 38 z = 39 } d = 40 } f = { a = 41 b = { x = 42 y = 43 z = 44 } c = 45 d = { x = 46 y = 47 z = 48 } } }
-// lldbr-check:(packed_struct_with_destructor::DeeplyNested) deeplyNested = { a = { a = 1 b = { x = 2 y = 3 z = 4 } c = 5 d = { x = 6 y = 7 z = 8 } } b = { a = 9 b = { x = 10 y = 11 z = 12 } c = { x = 13 y = 14 z = 15 } d = 16 } c = { a = 17 b = { x = 18 y = 19 z = 20 } c = 21 d = { x = 22 y = 23 z = 24 } } d = { a = 25 b = { x = 26 y = 27 z = 28 } c = 29 d = { x = 30 y = 31 z = 32 } } e = { a = 33 b = { x = 34 y = 35 z = 36 } c = { x = 37 y = 38 z = 39 } d = 40 } f = { a = 41 b = { x = 42 y = 43 z = 44 } c = 45 d = { x = 46 y = 47 z = 48 } } }
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/packed-struct.rs b/tests/debuginfo/packed-struct.rs
index 670482ef41e..5f5233e3732 100644
--- a/tests/debuginfo/packed-struct.rs
+++ b/tests/debuginfo/packed-struct.rs
@@ -29,27 +29,21 @@
 
 // lldb-command:v packed
 // lldbg-check:[...] { x = 123 y = 234 z = 345 }
-// lldbr-check:(packed_struct::Packed) packed = { x = 123 y = 234 z = 345 }
 
 // lldb-command:v packedInPacked
 // lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
-// lldbr-check:(packed_struct::PackedInPacked) packedInPacked = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
 
 // lldb-command:v packedInUnpacked
 // lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
-// lldbr-check:(packed_struct::PackedInUnpacked) packedInUnpacked = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
 
 // lldb-command:v unpackedInPacked
 // lldbg-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 }
-// lldbr-check:(packed_struct::UnpackedInPacked) unpackedInPacked = { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 }
 
 // lldb-command:expr sizeof(packed)
 // lldbg-check:[...] 14
-// lldbr-check:(usize) [...] 14
 
 // lldb-command:expr sizeof(packedInPacked)
 // lldbg-check:[...] 40
-// lldbr-check:(usize) [...] 40
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs
index 14f64e83cff..2489d6d4136 100644
--- a/tests/debuginfo/pretty-std-collections.rs
+++ b/tests/debuginfo/pretty-std-collections.rs
@@ -53,19 +53,15 @@
 
 // lldb-command:v vec_deque
 // lldbg-check:[...] size=3 { [0] = 5 [1] = 3 [2] = 7 }
-// lldbr-check:(alloc::collections::vec_deque::VecDeque<i32>) vec_deque = size=3 = { [0] = 5 [1] = 3 [2] = 7 }
 
 // lldb-command:v vec_deque2
 // lldbg-check:[...] size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
-// lldbr-check:(alloc::collections::vec_deque::VecDeque<i32>) vec_deque2 = size=7 = { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
 
 // lldb-command:v hash_map
 // lldbg-check:[...] size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } }
-// lldbr-check:(std::collections::hash::map::HashMap<u64, u64, [...]>) hash_map = size=4 size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } }
 
 // lldb-command:v hash_set
 // lldbg-check:[...] size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
-// lldbr-check:(std::collections::hash::set::HashSet<u64, [...]>) hash_set = size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
 
 #![allow(unused_variables)]
 use std::collections::BTreeMap;
diff --git a/tests/debuginfo/reference-debuginfo.rs b/tests/debuginfo/reference-debuginfo.rs
index 514228c6998..3889c1f5ba8 100644
--- a/tests/debuginfo/reference-debuginfo.rs
+++ b/tests/debuginfo/reference-debuginfo.rs
@@ -61,66 +61,49 @@
 // lldb-command:run
 // lldb-command:v *bool_ref
 // lldbg-check:[...] true
-// lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:v *int_ref
 // lldbg-check:[...] -1
-// lldbr-check:(isize) *int_ref = -1
 
-// lldbr-command:print *char_ref
-// lldbr-check:(char) *char_ref = 'a'
 
 // lldb-command:v *i8_ref
 // lldbg-check:[...] 'D'
-// lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:v *i16_ref
 // lldbg-check:[...] -16
-// lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:v *i32_ref
 // lldbg-check:[...] -32
-// lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:v *i64_ref
 // lldbg-check:[...] -64
-// lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:v *uint_ref
 // lldbg-check:[...] 1
-// lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:v *u8_ref
 // lldbg-check:[...] 'd'
-// lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:v *u16_ref
 // lldbg-check:[...] 16
-// lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:v *u32_ref
 // lldbg-check:[...] 32
-// lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:v *u64_ref
 // lldbg-check:[...] 64
-// lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:v *f16_ref
 // lldbg-check:[...] 1.5
-// lldbr-check:(f16) *f16_ref = 1.5
 
 // lldb-command:v *f32_ref
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:v *f64_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *f64_ref = 3.5
 
 // lldb-command:v *f64_double_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) **f64_double_ref = 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/regression-bad-location-list-67992.rs b/tests/debuginfo/regression-bad-location-list-67992.rs
index fe410942d51..6502cce3700 100644
--- a/tests/debuginfo/regression-bad-location-list-67992.rs
+++ b/tests/debuginfo/regression-bad-location-list-67992.rs
@@ -12,7 +12,6 @@
 // lldb-command:run
 // lldb-command:v a
 // lldbg-check:(regression_bad_location_list_67992::Foo) [...]
-// lldbr-check:(regression_bad_location_list_67992::Foo) a = [...]
 
 const ARRAY_SIZE: usize = 1024;
 
diff --git a/tests/debuginfo/self-in-default-method.rs b/tests/debuginfo/self-in-default-method.rs
index 9507e2c04a2..8c607d01210 100644
--- a/tests/debuginfo/self-in-default-method.rs
+++ b/tests/debuginfo/self-in-default-method.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] -2
-// lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 100 }
-// lldbr-check:(self_in_default_method::Struct) self = Struct { x: 100 }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(self_in_default_method::Struct) self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { x = 200 }
-// lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10
-// lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/self-in-generic-default-method.rs b/tests/debuginfo/self-in-generic-default-method.rs
index 4cb68f6fed8..71d1f2d52d2 100644
--- a/tests/debuginfo/self-in-generic-default-method.rs
+++ b/tests/debuginfo/self-in-generic-default-method.rs
@@ -57,61 +57,46 @@
 // STACK BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 987 }
-// lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 987 }
 // lldb-command:v arg1
 // lldbg-check:[...] -1
-// lldbr-check:(isize) arg1 = -1
 // lldb-command:v arg2
 // lldbg-check:[...] 2
-// lldbr-check:(u16) arg2 = 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 987 }
-// lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 987 }
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] -4
-// lldbr-check:(i16) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
 // lldbg-check:[...] { x = 879 }
-// lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 }
 // lldb-command:v arg1
 // lldbg-check:[...] -5
-// lldbr-check:(isize) arg1 = -5
 // lldb-command:v arg2
 // lldbg-check:[...] -6
-// lldbr-check:(i32) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
 // lldbg-check:[...] { x = 879 }
-// lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 879 }
 // lldb-command:v arg1
 // lldbg-check:[...] -7
-// lldbr-check:(isize) arg1 = -7
 // lldb-command:v arg2
 // lldbg-check:[...] -8
-// lldbr-check:(i64) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
 // lldbg-check:[...] { x = 879 }
-// lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 }
 // lldb-command:v arg1
 // lldbg-check:[...] -9
-// lldbr-check:(isize) arg1 = -9
 // lldb-command:v arg2
 // lldbg-check:[...] -10.5
-// lldbr-check:(f32) arg2 = -10.5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/shadowed-argument.rs b/tests/debuginfo/shadowed-argument.rs
index f85910652c8..b4da794ef95 100644
--- a/tests/debuginfo/shadowed-argument.rs
+++ b/tests/debuginfo/shadowed-argument.rs
@@ -29,26 +29,20 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/shadowed-variable.rs b/tests/debuginfo/shadowed-variable.rs
index 87c85a9e1e2..cbbad4c2b7c 100644
--- a/tests/debuginfo/shadowed-variable.rs
+++ b/tests/debuginfo/shadowed-variable.rs
@@ -40,42 +40,32 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:v y
 // lldbg-check:[...] true
-// lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 11.5
-// lldbr-check:(f64) x = 11.5
 // lldb-command:v y
 // lldbg-check:[...] 20
-// lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/simple-lexical-scope.rs b/tests/debuginfo/simple-lexical-scope.rs
index 148ad589dec..82737b04b64 100644
--- a/tests/debuginfo/simple-lexical-scope.rs
+++ b/tests/debuginfo/simple-lexical-scope.rs
@@ -39,37 +39,30 @@
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10.5
-// lldbr-check:(f64) x = 10.5
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] 10
-// lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:v x
 // lldbg-check:[...] false
-// lldbr-check:(bool) x = false
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/simple-struct.rs b/tests/debuginfo/simple-struct.rs
index 65bfb84cdcd..9fe4d3c8d3f 100644
--- a/tests/debuginfo/simple-struct.rs
+++ b/tests/debuginfo/simple-struct.rs
@@ -66,27 +66,21 @@
 
 // lldb-command:v no_padding16
 // lldbg-check:[...] { x = 10000 y = -10001 }
-// lldbr-check:(simple_struct::NoPadding16) no_padding16 = { x = 10000 y = -10001 }
 
 // lldb-command:v no_padding32
 // lldbg-check:[...] { x = -10002 y = -10003.5 z = 10004 }
-// lldbr-check:(simple_struct::NoPadding32) no_padding32 = { x = -10002 y = -10003.5 z = 10004 }
 
 // lldb-command:v no_padding64
 // lldbg-check:[...] { x = -10005.5 y = 10006 z = 10007 }
-// lldbr-check:(simple_struct::NoPadding64) no_padding64 = { x = -10005.5 y = 10006 z = 10007 }
 
 // lldb-command:v no_padding163264
 // lldbg-check:[...] { a = -10008 b = 10009 c = 10010 d = 10011 }
-// lldbr-check:(simple_struct::NoPadding163264) no_padding163264 = { a = -10008 b = 10009 c = 10010 d = 10011 }
 
 // lldb-command:v internal_padding
 // lldbg-check:[...] { x = 10012 y = -10013 }
-// lldbr-check:(simple_struct::InternalPadding) internal_padding = { x = 10012 y = -10013 }
 
 // lldb-command:v padding_at_end
 // lldbg-check:[...] { x = -10014 y = 10015 }
-// lldbr-check:(simple_struct::PaddingAtEnd) padding_at_end = { x = -10014 y = 10015 }
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs
index 6dadf923655..f267fc7d8d9 100644
--- a/tests/debuginfo/simple-tuple.rs
+++ b/tests/debuginfo/simple-tuple.rs
@@ -62,27 +62,20 @@
 
 // lldb-command:v/d noPadding8
 // lldbg-check:[...] { 0 = -100 1 = 100 }
-// lldbr-check:((i8, u8)) noPadding8 = { 0 = -100 1 = 100 }
 // lldb-command:v noPadding16
 // lldbg-check:[...] { 0 = 0 1 = 1 2 = 2 }
-// lldbr-check:((i16, i16, u16)) noPadding16 = { 0 = 0 1 = 1 2 = 2 }
 // lldb-command:v noPadding32
 // lldbg-check:[...] { 0 = 3 1 = 4.5 2 = 5 }
-// lldbr-check:((i32, f32, u32)) noPadding32 = { 0 = 3 1 = 4.5 2 = 5 }
 // lldb-command:v noPadding64
 // lldbg-check:[...] { 0 = 6 1 = 7.5 2 = 8 }
-// lldbr-check:((i64, f64, u64)) noPadding64 = { 0 = 6 1 = 7.5 2 = 8 }
 
 // lldb-command:v internalPadding1
 // lldbg-check:[...] { 0 = 9 1 = 10 }
-// lldbr-check:((i16, i32)) internalPadding1 = { 0 = 9 1 = 10 }
 // lldb-command:v internalPadding2
 // lldbg-check:[...] { 0 = 11 1 = 12 2 = 13 3 = 14 }
-// lldbr-check:((i16, i32, u32, u64)) internalPadding2 = { 0 = 11 1 = 12 2 = 13 3 = 14 }
 
 // lldb-command:v paddingAtEnd
 // lldbg-check:[...] { 0 = 15 1 = 16 }
-// lldbr-check:((i32, i16)) paddingAtEnd = { 0 = 15 1 = 16 }
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/static-method-on-struct-and-enum.rs b/tests/debuginfo/static-method-on-struct-and-enum.rs
index defced1441c..5d2932e378d 100644
--- a/tests/debuginfo/static-method-on-struct-and-enum.rs
+++ b/tests/debuginfo/static-method-on-struct-and-enum.rs
@@ -28,22 +28,17 @@
 // STRUCT
 // lldb-command:v arg1
 // lldbg-check:[...] 1
-// lldbr-check:(isize) arg1 = 1
 // lldb-command:v arg2
 // lldbg-check:[...] 2
-// lldbr-check:(isize) arg2 = 2
 // lldb-command:continue
 
 // ENUM
 // lldb-command:v arg1
 // lldbg-check:[...] -3
-// lldbr-check:(isize) arg1 = -3
 // lldb-command:v arg2
 // lldbg-check:[...] 4.5
-// lldbr-check:(f64) arg2 = 4.5
 // lldb-command:v arg3
 // lldbg-check:[...] 5
-// lldbr-check:(usize) arg3 = 5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-in-struct.rs b/tests/debuginfo/struct-in-struct.rs
index 2e32633fa87..5dde8079f9a 100644
--- a/tests/debuginfo/struct-in-struct.rs
+++ b/tests/debuginfo/struct-in-struct.rs
@@ -20,35 +20,27 @@
 
 // lldb-command:v three_simple_structs
 // lldbg-check:[...] { x = { x = 1 } y = { x = 2 } z = { x = 3 } }
-// lldbr-check:(struct_in_struct::ThreeSimpleStructs) three_simple_structs = { x = { x = 1 } y = { x = 2 } z = { x = 3 } }
 
 // lldb-command:v internal_padding_parent
 // lldbg-check:[...] { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } }
-// lldbr-check:(struct_in_struct::InternalPaddingParent) internal_padding_parent = { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } }
 
 // lldb-command:v padding_at_end_parent
 // lldbg-check:[...] { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } }
-// lldbr-check:(struct_in_struct::PaddingAtEndParent) padding_at_end_parent = { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } }
 
 // lldb-command:v mixed
 // lldbg-check:[...] { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 }
-// lldbr-check:(struct_in_struct::Mixed) mixed = { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 }
 
 // lldb-command:v bag
 // lldbg-check:[...] { x = { x = 22 } }
-// lldbr-check:(struct_in_struct::Bag) bag = { x = { x = 22 } }
 
 // lldb-command:v bag_in_bag
 // lldbg-check:[...] { x = { x = { x = 23 } } }
-// lldbr-check:(struct_in_struct::BagInBag) bag_in_bag = { x = { x = { x = 23 } } }
 
 // lldb-command:v tjo
 // lldbg-check:[...] { x = { x = { x = { x = 24 } } } }
-// lldbr-check:(struct_in_struct::ThatsJustOverkill) tjo = { x = { x = { x = { x = 24 } } } }
 
 // lldb-command:v tree
 // lldbg-check:[...] { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } }
-// lldbr-check:(struct_in_struct::Tree) tree = { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-namespace.rs b/tests/debuginfo/struct-namespace.rs
index 83f2962140a..aacc1d3825d 100644
--- a/tests/debuginfo/struct-namespace.rs
+++ b/tests/debuginfo/struct-namespace.rs
@@ -6,17 +6,13 @@
 // lldb-command:run
 // lldb-command:v struct1
 // lldbg-check:(struct_namespace::Struct1)[...]
-// lldbr-check:(struct_namespace::Struct1) struct1 = Struct1 { a: 0, b: 1 }
 // lldb-command:v struct2
 // lldbg-check:(struct_namespace::Struct2)[...]
-// lldbr-check:(struct_namespace::Struct2) struct2 = { = 2 }
 
 // lldb-command:v mod1_struct1
 // lldbg-check:(struct_namespace::mod1::Struct1)[...]
-// lldbr-check:(struct_namespace::mod1::Struct1) mod1_struct1 = Struct1 { a: 3, b: 4 }
 // lldb-command:v mod1_struct2
 // lldbg-check:(struct_namespace::mod1::Struct2)[...]
-// lldbr-check:(struct_namespace::mod1::Struct2) mod1_struct2 = { = 5 }
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/struct-style-enum.rs b/tests/debuginfo/struct-style-enum.rs
index c3cfb29994e..c2f7fb688ed 100644
--- a/tests/debuginfo/struct-style-enum.rs
+++ b/tests/debuginfo/struct-style-enum.rs
@@ -25,19 +25,15 @@
 
 // lldb-command:v case1
 // lldbg-check:(struct_style_enum::Regular) case1 = { value = { a = 0 b = 31868 c = 31868 d = 31868 e = 31868 } $discr$ = 0 }
-// lldbr-check:(struct_style_enum::Regular::Case1) case1 = { a = 0 b = 31868 c = 31868 d = 31868 e = 31868 }
 
 // lldb-command:v case2
 // lldbg-check:(struct_style_enum::Regular) case2 = { value = { a = 0 b = 286331153 c = 286331153 } $discr$ = 1 }
-// lldbr-check:(struct_style_enum::Regular::Case2) case2 = Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 }
 
 // lldb-command:v case3
 // lldbg-check:(struct_style_enum::Regular) case3 = { value = { a = 0 b = 6438275382588823897 } $discr$ = 2 }
-// lldbr-check:(struct_style_enum::Regular::Case3) case3 = Case3 { Case1: 0, Case2: 6438275382588823897 }
 
 // lldb-command:v univariant
 // lldbg-check:(struct_style_enum::Univariant) univariant = { value = { a = -1 } }
-// lldbr-check:(struct_style_enum::Univariant) univariant = Univariant { TheOnlyCase: TheOnlyCase { a: -1 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-with-destructor.rs b/tests/debuginfo/struct-with-destructor.rs
index 05a4b757283..654a574ebb5 100644
--- a/tests/debuginfo/struct-with-destructor.rs
+++ b/tests/debuginfo/struct-with-destructor.rs
@@ -21,19 +21,15 @@
 // lldb-command:run
 // lldb-command:v simple
 // lldbg-check:[...] { x = 10 y = 20 }
-// lldbr-check:(struct_with_destructor::WithDestructor) simple = { x = 10 y = 20 }
 
 // lldb-command:v noDestructor
 // lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 }
-// lldbr-check:(struct_with_destructor::NoDestructorGuarded) noDestructor = { a = { x = 10 y = 20 } guard = -1 }
 
 // lldb-command:v withDestructor
 // lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 }
-// lldbr-check:(struct_with_destructor::WithDestructorGuarded) withDestructor = { a = { x = 10 y = 20 } guard = -1 }
 
 // lldb-command:v nested
 // lldbg-check:[...] { a = { a = { x = 7890 y = 9870 } } }
-// lldbr-check:(struct_with_destructor::NestedOuter) nested = { a = { a = { x = 7890 y = 9870 } } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs
index 0d7ffc63470..74ccaf14d00 100644
--- a/tests/debuginfo/tuple-in-tuple.rs
+++ b/tests/debuginfo/tuple-in-tuple.rs
@@ -28,27 +28,20 @@
 
 // lldb-command:v no_padding1
 // lldbg-check:[...] { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
-// lldbr-check:(((u32, u32), u32, u32)) no_padding1 = { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
 // lldb-command:v no_padding2
 // lldbg-check:[...] { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 }
-// lldbr-check:((u32, (u32, u32), u32)) no_padding2 = { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 }
 // lldb-command:v no_padding3
 // lldbg-check:[...] { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } }
-// lldbr-check:((u32, u32, (u32, u32))) no_padding3 = { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } }
 
 // lldb-command:v internal_padding1
 // lldbg-check:[...] { 0 = 12 1 = { 0 = 13 1 = 14 } }
-// lldbr-check:((i16, (i32, i32))) internal_padding1 = { 0 = 12 1 = { 0 = 13 1 = 14 } }
 // lldb-command:v internal_padding2
 // lldbg-check:[...] { 0 = 15 1 = { 0 = 16 1 = 17 } }
-// lldbr-check:((i16, (i16, i32))) internal_padding2 = { 0 = 15 1 = { 0 = 16 1 = 17 } }
 
 // lldb-command:v padding_at_end1
 // lldbg-check:[...] { 0 = 18 1 = { 0 = 19 1 = 20 } }
-// lldbr-check:((i32, (i32, i16))) padding_at_end1 = { 0 = 18 1 = { 0 = 19 1 = 20 } }
 // lldb-command:v padding_at_end2
 // lldbg-check:[...] { 0 = { 0 = 21 1 = 22 } 1 = 23 }
-// lldbr-check:(((i32, i16), i32)) padding_at_end2 = { 0 = { 0 = 21 1 = 22 } 1 = 23 }
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/tuple-struct.rs b/tests/debuginfo/tuple-struct.rs
index abfbfac22eb..f9755a8a0d5 100644
--- a/tests/debuginfo/tuple-struct.rs
+++ b/tests/debuginfo/tuple-struct.rs
@@ -29,27 +29,21 @@
 
 // lldb-command:v no_padding16
 // lldbg-check:[...] { 0 = 10000 1 = -10001 }
-// lldbr-check:(tuple_struct::NoPadding16) no_padding16 = { 0 = 10000 1 = -10001 }
 
 // lldb-command:v no_padding32
 // lldbg-check:[...] { 0 = -10002 1 = -10003.5 2 = 10004 }
-// lldbr-check:(tuple_struct::NoPadding32) no_padding32 = { 0 = -10002 1 = -10003.5 2 = 10004 }
 
 // lldb-command:v no_padding64
 // lldbg-check:[...] { 0 = -10005.5 1 = 10006 2 = 10007 }
-// lldbr-check:(tuple_struct::NoPadding64) no_padding64 = { 0 = -10005.5 1 = 10006 2 = 10007 }
 
 // lldb-command:v no_padding163264
 // lldbg-check:[...] { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 }
-// lldbr-check:(tuple_struct::NoPadding163264) no_padding163264 = { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 }
 
 // lldb-command:v internal_padding
 // lldbg-check:[...] { 0 = 10012 1 = -10013 }
-// lldbr-check:(tuple_struct::InternalPadding) internal_padding = { 0 = 10012 1 = -10013 }
 
 // lldb-command:v padding_at_end
 // lldbg-check:[...] { 0 = -10014 1 = 10015 }
-// lldbr-check:(tuple_struct::PaddingAtEnd) padding_at_end = { 0 = -10014 1 = 10015 }
 
 // This test case mainly makes sure that no field names are generated for tuple structs (as opposed
 // to all fields having the name "<unnamed_field>"). Otherwise they are handled the same a normal
diff --git a/tests/debuginfo/tuple-style-enum.rs b/tests/debuginfo/tuple-style-enum.rs
index 2a11bfe7065..efdf8c6970e 100644
--- a/tests/debuginfo/tuple-style-enum.rs
+++ b/tests/debuginfo/tuple-style-enum.rs
@@ -26,19 +26,15 @@
 
 // lldb-command:v case1
 // lldbg-check:(tuple_style_enum::Regular) case1 = { value = { 0 = 0 1 = 31868 2 = 31868 3 = 31868 4 = 31868 } $discr$ = 0 }
-// lldbr-check:(tuple_style_enum::Regular::Case1) case1 = { = 0 = 31868 = 31868 = 31868 = 31868 }
 
 // lldb-command:v case2
 // lldbg-check:(tuple_style_enum::Regular) case2 = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
-// lldbr-check:(tuple_style_enum::Regular::Case2) case2 = Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 }
 
 // lldb-command:v case3
 // lldbg-check:(tuple_style_enum::Regular) case3 = { value = { 0 = 0 1 = 6438275382588823897 } $discr$ = 2 }
-// lldbr-check:(tuple_style_enum::Regular::Case3) case3 = Case3 { Case1: 0, Case2: 6438275382588823897 }
 
 // lldb-command:v univariant
 // lldbg-check:(tuple_style_enum::Univariant) univariant = { value = { 0 = -1 } }
-// lldbr-check:(tuple_style_enum::Univariant) univariant = { TheOnlyCase = { = -1 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs
index 41bd81c9e8a..73617df10b1 100644
--- a/tests/debuginfo/union-smoke.rs
+++ b/tests/debuginfo/union-smoke.rs
@@ -13,7 +13,6 @@
 // lldb-command:run
 // lldb-command:v u
 // lldbg-check:[...] { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
-// lldbr-check:(union_smoke::U) u = { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
 
 // lldbg-command:print union_smoke::SU
 // lldbg-check:[...] { a = { 0 = '\x01' 1 = '\x01' } b = 257 }
diff --git a/tests/debuginfo/unique-enum.rs b/tests/debuginfo/unique-enum.rs
index 6990f18788c..b9ee480c851 100644
--- a/tests/debuginfo/unique-enum.rs
+++ b/tests/debuginfo/unique-enum.rs
@@ -22,15 +22,12 @@
 
 // lldb-command:v *the_a
 // lldbg-check:(unique_enum::ABC) *the_a = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
-// lldbr-check:(unique_enum::ABC::TheA) *the_a = TheA { TheA: 0, TheB: 8970181431921507452 }
 
 // lldb-command:v *the_b
 // lldbg-check:(unique_enum::ABC) *the_b = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
-// lldbr-check:(unique_enum::ABC::TheB) *the_b = { = 0 = 286331153 = 286331153 }
 
 // lldb-command:v *univariant
 // lldbg-check:(unique_enum::Univariant) *univariant = { value = { 0 = 123234 } }
-// lldbr-check:(unique_enum::Univariant) *univariant = { TheOnlyCase = { = 123234 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/var-captured-in-nested-closure.rs b/tests/debuginfo/var-captured-in-nested-closure.rs
index bed2a57e1f9..0f544c24b5b 100644
--- a/tests/debuginfo/var-captured-in-nested-closure.rs
+++ b/tests/debuginfo/var-captured-in-nested-closure.rs
@@ -39,42 +39,30 @@
 
 // lldb-command:v variable
 // lldbg-check:[...] 1
-// lldbr-check:(isize) variable = 1
 // lldb-command:v constant
 // lldbg-check:[...] 2
-// lldbr-check:(isize) constant = 2
 // lldb-command:v a_struct
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_nested_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_nested_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
 // lldbg-check:[...] 6
-// lldbr-check:(isize) *owned = 6
 // lldb-command:v closure_local
 // lldbg-check:[...] 8
-// lldbr-check:(isize) closure_local = 8
 // lldb-command:continue
 
 // lldb-command:v variable
 // lldbg-check:[...] 1
-// lldbr-check:(isize) variable = 1
 // lldb-command:v constant
 // lldbg-check:[...] 2
-// lldbr-check:(isize) constant = 2
 // lldb-command:v a_struct
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_nested_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_nested_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
 // lldbg-check:[...] 6
-// lldbr-check:(isize) *owned = 6
 // lldb-command:v closure_local
 // lldbg-check:[...] 8
-// lldbr-check:(isize) closure_local = 8
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/var-captured-in-sendable-closure.rs b/tests/debuginfo/var-captured-in-sendable-closure.rs
index 59909b75826..2d9e6074473 100644
--- a/tests/debuginfo/var-captured-in-sendable-closure.rs
+++ b/tests/debuginfo/var-captured-in-sendable-closure.rs
@@ -22,13 +22,10 @@
 
 // lldb-command:v constant
 // lldbg-check:[...] 1
-// lldbr-check:(isize) constant = 1
 // lldb-command:v a_struct
 // lldbg-check:[...] { a = -2 b = 3.5 c = 4 }
-// lldbr-check:(var_captured_in_sendable_closure::Struct) a_struct = { a = -2 b = 3.5 c = 4 }
 // lldb-command:v *owned
 // lldbg-check:[...] 5
-// lldbr-check:(isize) *owned = 5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/var-captured-in-stack-closure.rs b/tests/debuginfo/var-captured-in-stack-closure.rs
index 5ac80446433..d6c4b11b5f2 100644
--- a/tests/debuginfo/var-captured-in-stack-closure.rs
+++ b/tests/debuginfo/var-captured-in-stack-closure.rs
@@ -35,37 +35,27 @@
 
 // lldb-command:v variable
 // lldbg-check:[...] 1
-// lldbr-check:(isize) variable = 1
 // lldb-command:v constant
 // lldbg-check:[...] 2
-// lldbr-check:(isize) constant = 2
 // lldb-command:v a_struct
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_stack_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_stack_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
 // lldbg-check:[...] 6
-// lldbr-check:(isize) *owned = 6
 
 // lldb-command:continue
 
 // lldb-command:v variable
 // lldbg-check:[...] 2
-// lldbr-check:(isize) variable = 2
 // lldb-command:v constant
 // lldbg-check:[...] 2
-// lldbr-check:(isize) constant = 2
 // lldb-command:v a_struct
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_stack_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
 // lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
-// lldbr-check:(var_captured_in_stack_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
 // lldbg-check:[...] 6
-// lldbr-check:(isize) *owned = 6
 
 
 // === CDB TESTS ===================================================================================
diff --git a/tests/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs
index a8463168528..77d7b90ca0b 100644
--- a/tests/debuginfo/vec-slices.rs
+++ b/tests/debuginfo/vec-slices.rs
@@ -54,27 +54,21 @@
 
 // lldb-command:v empty
 // lldbg-check:[...] size=0
-// lldbr-check:(&[i64]) empty = size=0
 
 // lldb-command:v singleton
 // lldbg-check:[...] size=1 { [0] = 1 }
-// lldbr-check:(&[i64]) singleton = &[1]
 
 // lldb-command:v multiple
 // lldbg-check:[...] size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 }
-// lldbr-check:(&[i64]) multiple = size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 }
 
 // lldb-command:v slice_of_slice
 // lldbg-check:[...] size=2 { [0] = 3 [1] = 4 }
-// lldbr-check:(&[i64]) slice_of_slice = size=2 { [0] = 3 [1] = 4 }
 
 // lldb-command:v padded_tuple
 // lldbg-check:[...] size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } }
-// lldbr-check:(&[(i32, i16)]) padded_tuple = size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } }
 
 // lldb-command:v padded_struct
 // lldbg-check:[...] size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }
-// lldbr-check:(&[vec_slices::AStruct]) padded_struct = size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }
 
 #![allow(dead_code, unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/vec.rs b/tests/debuginfo/vec.rs
index 24b7ae9c394..3bb84d48573 100644
--- a/tests/debuginfo/vec.rs
+++ b/tests/debuginfo/vec.rs
@@ -14,7 +14,6 @@
 // lldb-command:run
 // lldb-command:v a
 // lldbg-check:[...] { [0] = 1 [1] = 2 [2] = 3 }
-// lldbr-check:([i32; 3]) a = { [0] = 1 [1] = 2 [2] = 3 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]