Remove LLDB persistent results in `compiletest`.

90 files changed, 824 insertions, 835 deletions

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index e26e9df6f16..8655d3512e1 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1477,15 +1477,6 @@ impl<'test> TestCx<'test> {
         let rust_pp_module_rel_path = Path::new("./src/etc");
         let rust_pp_module_abs_path = rust_src_root.join(rust_pp_module_rel_path);
 
-        // In newer versions of lldb, persistent results (the `$N =` part at the start of
-        // expressions you have evaluated that let you re-use the result) aren't printed, but lots
-        // of rustc's debuginfo tests rely on these, so re-enable this.
-        // See <https://reviews.llvm.org/rG385496385476fc9735da5fa4acabc34654e8b30d>.
-        script_str.push_str("command unalias print\n");
-        script_str.push_str("command alias print expr --\n");
-        script_str.push_str("command unalias p\n");
-        script_str.push_str("command alias p expr --\n");
-
         script_str.push_str(&format!(
             "command script import {}/lldb_lookup.py\n",
             rust_pp_module_abs_path.to_str().unwrap()
diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index ab41073b7c4..182541b038a 100644
--- a/tests/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
@@ -43,41 +43,41 @@
 // lldb-command:run
 
 // lldb-command:print arg
-// lldbg-check:[...]$0 = { b = -1, b1 = 0 }
+// lldbg-check:[...] { b = -1, b1 = 0 }
 // lldbr-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
 // lldb-command:continue
 
 // lldb-command:print inferred
-// lldbg-check:[...]$1 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i64) inferred = 1
 // lldb-command:print explicitly
-// lldbg-check:[...]$2 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i64) explicitly = 1
 // lldb-command:continue
 
 // lldb-command:print arg
-// lldbg-check:[...]$3 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i64) arg = 2
 // lldb-command:continue
 
 // lldb-command:print arg
-// lldbg-check:[...]$4 = (4, 5)
+// lldbg-check:[...] (4, 5)
 // lldbr-check:((i32, i64)) arg = { = 4 = 5 }
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$5 = 6
+// lldbg-check:[...] 6
 // lldbr-check:(i32) a = 6
 // lldb-command:print b
-// lldbg-check:[...]$6 = 7
+// lldbg-check:[...] 7
 // lldbr-check:(i64) b = 7
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$7 = 8
+// lldbg-check:[...] 8
 // lldbr-check:(i64) a = 8
 // lldb-command:print b
-// lldbg-check:[...]$8 = 9
+// lldbg-check:[...] 9
 // lldbr-check:(i32) b = 9
 // lldb-command:continue
 
diff --git a/tests/debuginfo/basic-types.rs b/tests/debuginfo/basic-types.rs
index 8319b71bfcd..3a023a890f3 100644
--- a/tests/debuginfo/basic-types.rs
+++ b/tests/debuginfo/basic-types.rs
@@ -51,10 +51,10 @@
 
 // lldb-command:run
 // lldb-command:print b
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) b = false
 // lldb-command:print i
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) i = -1
 
 // NOTE: only rust-enabled lldb supports 32bit chars
@@ -62,37 +62,37 @@
 // lldbr-check:(char) c = 'a'
 
 // lldb-command:print i8
-// lldbg-check:[...]$2 = 'D'
+// lldbg-check:[...] 'D'
 // lldbr-check:(i8) i8 = 68
 // lldb-command:print i16
-// lldbg-check:[...]$3 = -16
+// lldbg-check:[...] -16
 // lldbr-check:(i16) i16 = -16
 // lldb-command:print i32
-// lldbg-check:[...]$4 = -32
+// lldbg-check:[...] -32
 // lldbr-check:(i32) i32 = -32
 // lldb-command:print i64
-// lldbg-check:[...]$5 = -64
+// lldbg-check:[...] -64
 // lldbr-check:(i64) i64 = -64
 // lldb-command:print u
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(usize) u = 1
 // lldb-command:print u8
-// lldbg-check:[...]$7 = 'd'
+// lldbg-check:[...] 'd'
 // lldbr-check:(u8) u8 = 100
 // lldb-command:print u16
-// lldbg-check:[...]$8 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(u16) u16 = 16
 // lldb-command:print u32
-// lldbg-check:[...]$9 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(u32) u32 = 32
 // lldb-command:print u64
-// lldbg-check:[...]$10 = 64
+// lldbg-check:[...] 64
 // lldbr-check:(u64) u64 = 64
 // lldb-command:print f32
-// lldbg-check:[...]$11 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f32) f32 = 2.5
 // lldb-command:print f64
-// lldbg-check:[...]$12 = 3.5
+// 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 52d61f33e7c..e30131190af 100644
--- a/tests/debuginfo/borrowed-basic.rs
+++ b/tests/debuginfo/borrowed-basic.rs
@@ -53,11 +53,11 @@
 
 // lldb-command:run
 // lldb-command:print *bool_ref
-// lldbg-check:[...]$0 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:print *int_ref
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) *int_ref = -1
 
 // NOTE: only rust-enabled lldb supports 32bit chars
@@ -65,47 +65,47 @@
 // lldbr-check:(char) *char_ref = 'a'
 
 // lldb-command:print *i8_ref
-// lldbg-check:[...]$2 = 'D'
+// lldbg-check:[...] 'D'
 // lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:print *i16_ref
-// lldbg-check:[...]$3 = -16
+// lldbg-check:[...] -16
 // lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:print *i32_ref
-// lldbg-check:[...]$4 = -32
+// lldbg-check:[...] -32
 // lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:print *i64_ref
-// lldbg-check:[...]$5 = -64
+// lldbg-check:[...] -64
 // lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:print *uint_ref
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:print *u8_ref
-// lldbg-check:[...]$7 = 'd'
+// lldbg-check:[...] 'd'
 // lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:print *u16_ref
-// lldbg-check:[...]$8 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:print *u32_ref
-// lldbg-check:[...]$9 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:print *u64_ref
-// lldbg-check:[...]$10 = 64
+// lldbg-check:[...] 64
 // lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:print *f32_ref
-// lldbg-check:[...]$11 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:print *f64_ref
-// lldbg-check:[...]$12 = 3.5
+// lldbg-check:[...] 3.5
 // lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/borrowed-c-style-enum.rs b/tests/debuginfo/borrowed-c-style-enum.rs
index 950a05a0992..c6a8bf95386 100644
--- a/tests/debuginfo/borrowed-c-style-enum.rs
+++ b/tests/debuginfo/borrowed-c-style-enum.rs
@@ -23,15 +23,15 @@
 // lldb-command:run
 
 // lldb-command:print *the_a_ref
-// lldbg-check:[...]$0 = TheA
+// lldbg-check:[...] TheA
 // lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
 
 // lldb-command:print *the_b_ref
-// lldbg-check:[...]$1 = TheB
+// lldbg-check:[...] TheB
 // lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
 
 // lldb-command:print *the_c_ref
-// lldbg-check:[...]$2 = TheC
+// lldbg-check:[...] TheC
 // lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/borrowed-struct.rs b/tests/debuginfo/borrowed-struct.rs
index 467de7878ee..96ceec42ab5 100644
--- a/tests/debuginfo/borrowed-struct.rs
+++ b/tests/debuginfo/borrowed-struct.rs
@@ -35,31 +35,31 @@
 // lldb-command:run
 
 // lldb-command:print *stack_val_ref
-// lldbg-check:[...]$0 = { x = 10 y = 23.5 }
+// lldbg-check:[...] { x = 10 y = 23.5 }
 // lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
 
 // lldb-command:print *stack_val_interior_ref_1
-// lldbg-check:[...]$1 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) *stack_val_interior_ref_1 = 10
 
 // lldb-command:print *stack_val_interior_ref_2
-// lldbg-check:[...]$2 = 23.5
+// lldbg-check:[...] 23.5
 // lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5
 
 // lldb-command:print *ref_to_unnamed
-// lldbg-check:[...]$3 = { x = 11 y = 24.5 }
+// lldbg-check:[...] { x = 11 y = 24.5 }
 // lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
 
 // lldb-command:print *unique_val_ref
-// lldbg-check:[...]$4 = { x = 13 y = 26.5 }
+// lldbg-check:[...] { x = 13 y = 26.5 }
 // lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
 
 // lldb-command:print *unique_val_interior_ref_1
-// lldbg-check:[...]$5 = 13
+// lldbg-check:[...] 13
 // lldbr-check:(isize) *unique_val_interior_ref_1 = 13
 
 // lldb-command:print *unique_val_interior_ref_2
-// lldbg-check:[...]$6 = 26.5
+// lldbg-check:[...] 26.5
 // lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs
index 4fe1abbaba2..8d9c5e9fd2d 100644
--- a/tests/debuginfo/borrowed-tuple.rs
+++ b/tests/debuginfo/borrowed-tuple.rs
@@ -24,15 +24,15 @@
 // lldb-command:run
 
 // lldb-command:print *stack_val_ref
-// lldbg-check:[...]$0 = { 0 = -14 1 = -19 }
+// lldbg-check:[...] { 0 = -14 1 = -19 }
 // lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
 
 // lldb-command:print *ref_to_unnamed
-// lldbg-check:[...]$1 = { 0 = -15 1 = -20 }
+// lldbg-check:[...] { 0 = -15 1 = -20 }
 // lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
 
 // lldb-command:print *unique_val_ref
-// lldbg-check:[...]$2 = { 0 = -17 1 = -22 }
+// lldbg-check:[...] { 0 = -17 1 = -22 }
 // lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
 
 
diff --git a/tests/debuginfo/borrowed-unique-basic.rs b/tests/debuginfo/borrowed-unique-basic.rs
index ae843c355bc..38e6ce0a6ae 100644
--- a/tests/debuginfo/borrowed-unique-basic.rs
+++ b/tests/debuginfo/borrowed-unique-basic.rs
@@ -56,11 +56,11 @@
 // lldb-command:run
 
 // lldb-command:print *bool_ref
-// lldbg-check:[...]$0 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:print *int_ref
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) *int_ref = -1
 
 // NOTE: only rust-enabled lldb supports 32bit chars
@@ -68,47 +68,47 @@
 // lldbr-check:(char) *char_ref = 97
 
 // lldb-command:print *i8_ref
-// lldbg-check:[...]$2 = 68
+// lldbg-check:[...] 68
 // lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:print *i16_ref
-// lldbg-check:[...]$3 = -16
+// lldbg-check:[...] -16
 // lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:print *i32_ref
-// lldbg-check:[...]$4 = -32
+// lldbg-check:[...] -32
 // lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:print *i64_ref
-// lldbg-check:[...]$5 = -64
+// lldbg-check:[...] -64
 // lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:print *uint_ref
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:print *u8_ref
-// lldbg-check:[...]$7 = 100
+// lldbg-check:[...] 100
 // lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:print *u16_ref
-// lldbg-check:[...]$8 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:print *u32_ref
-// lldbg-check:[...]$9 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:print *u64_ref
-// lldbg-check:[...]$10 = 64
+// lldbg-check:[...] 64
 // lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:print *f32_ref
-// lldbg-check:[...]$11 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:print *f64_ref
-// lldbg-check:[...]$12 = 3.5
+// lldbg-check:[...] 3.5
 // lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/box.rs b/tests/debuginfo/box.rs
index f2e744e87b9..2c309a4eb28 100644
--- a/tests/debuginfo/box.rs
+++ b/tests/debuginfo/box.rs
@@ -17,10 +17,10 @@
 
 // lldb-command:run
 // lldb-command:print *a
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) *a = 1
 // lldb-command:print *b
-// lldbg-check:[...]$1 = { 0 = 2 1 = 3.5 }
+// lldbg-check:[...] { 0 = 2 1 = 3.5 }
 // lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/boxed-struct.rs b/tests/debuginfo/boxed-struct.rs
index c47bffb3a38..be2f1a7a867 100644
--- a/tests/debuginfo/boxed-struct.rs
+++ b/tests/debuginfo/boxed-struct.rs
@@ -20,11 +20,11 @@
 // lldb-command:run
 
 // lldb-command:print *boxed_with_padding
-// lldbg-check:[...]$0 = { x = 99 y = 999 z = 9999 w = 99999 }
+// 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:print *boxed_with_dtor
-// lldbg-check:[...]$1 = { x = 77 y = 777 z = 7777 w = 77777 }
+// 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)]
diff --git a/tests/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs
index 52e3dc9a76b..413eefa3f2d 100644
--- a/tests/debuginfo/by-value-non-immediate-argument.rs
+++ b/tests/debuginfo/by-value-non-immediate-argument.rs
@@ -42,27 +42,27 @@
 // lldb-command:run
 
 // lldb-command:print s
-// lldb-check:[...]$0 = Struct { a: 1, b: 2.5 }
+// lldb-check:[...] Struct { a: 1, b: 2.5 }
 // lldb-command:continue
 
 // lldb-command:print x
-// lldb-check:[...]$1 = Struct { a: 3, b: 4.5 }
+// lldb-check:[...] Struct { a: 3, b: 4.5 }
 // lldb-command:print y
-// lldb-check:[...]$2 = 5
+// lldb-check:[...] 5
 // lldb-command:print z
-// lldb-check:[...]$3 = 6.5
+// lldb-check:[...] 6.5
 // lldb-command:continue
 
 // lldb-command:print a
-// lldb-check:[...]$4 = (7, 8, 9.5, 10.5)
+// lldb-check:[...] (7, 8, 9.5, 10.5)
 // lldb-command:continue
 
 // lldb-command:print a
-// lldb-check:[...]$5 = Newtype(11.5, 12.5, 13, 14)
+// lldb-check:[...] Newtype(11.5, 12.5, 13, 14)
 // lldb-command:continue
 
 // lldb-command:print x
-// lldb-check:[...]$6 = Case1 { x: 0, y: 8970181431921507452 }
+// lldb-check:[...] Case1 { x: 0, y: 8970181431921507452 }
 // lldb-command:continue
 
 #![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 247d6c27a06..7b52d054b32 100644
--- a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
@@ -26,17 +26,17 @@
 // lldb-command:run
 
 // lldb-command:print self
-// lldbg-check:[...]$0 = 1111
+// lldbg-check:[...] 1111
 // lldbr-check:(isize) self = 1111
 // lldb-command:continue
 
 // lldb-command:print self
-// lldbg-check:[...]$1 = { x = 2222 y = 3333 }
+// 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:print self
-// lldbg-check:[...] $2 = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
+// 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
 
diff --git a/tests/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs
index 3f0968f09af..82d38038eaf 100644
--- a/tests/debuginfo/c-style-enum-in-composite.rs
+++ b/tests/debuginfo/c-style-enum-in-composite.rs
@@ -39,31 +39,31 @@
 // lldb-command:run
 
 // lldb-command:print tuple_interior_padding
-// lldbg-check:[...]$0 = { 0 = 0 1 = OneHundred }
+// lldbg-check:[...] { 0 = 0 1 = OneHundred }
 // lldbr-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred }
 
 // lldb-command:print tuple_padding_at_end
-// lldbg-check:[...]$1 = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
+// 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:print tuple_different_enums
-// lldbg-check:[...]$2 = { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
+// 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:print padded_struct
-// lldbg-check:[...]$3 = { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
+// 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:print packed_struct
-// lldbg-check:[...]$4 = { a = 6 b = OneHundred c = 7 d = Vienna e = 8 }
+// 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:print non_padded_struct
-// lldbg-check:[...]$5 = { a = OneMillion b = MountainView c = OneThousand d = Toronto }
+// 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:print struct_with_drop
-// lldbg-check:[...]$6 = { 0 = { a = OneHundred b = Vienna } 1 = 9 }
+// 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)]
diff --git a/tests/debuginfo/c-style-enum.rs b/tests/debuginfo/c-style-enum.rs
index 2794575d328..4d84324df2c 100644
--- a/tests/debuginfo/c-style-enum.rs
+++ b/tests/debuginfo/c-style-enum.rs
@@ -97,31 +97,31 @@
 // lldb-command:run
 
 // lldb-command:print auto_one
-// lldbg-check:[...]$0 = One
+// lldbg-check:[...] One
 // lldbr-check:(c_style_enum::AutoDiscriminant) auto_one = c_style_enum::AutoDiscriminant::One
 
 // lldb-command:print auto_two
-// lldbg-check:[...]$1 = Two
+// lldbg-check:[...] Two
 // lldbr-check:(c_style_enum::AutoDiscriminant) auto_two = c_style_enum::AutoDiscriminant::Two
 
 // lldb-command:print auto_three
-// lldbg-check:[...]$2 = Three
+// lldbg-check:[...] Three
 // lldbr-check:(c_style_enum::AutoDiscriminant) auto_three = c_style_enum::AutoDiscriminant::Three
 
 // lldb-command:print manual_one_hundred
-// lldbg-check:[...]$3 = OneHundred
+// lldbg-check:[...] OneHundred
 // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_hundred = c_style_enum::ManualDiscriminant::OneHundred
 
 // lldb-command:print manual_one_thousand
-// lldbg-check:[...]$4 = OneThousand
+// lldbg-check:[...] OneThousand
 // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_thousand = c_style_enum::ManualDiscriminant::OneThousand
 
 // lldb-command:print manual_one_million
-// lldbg-check:[...]$5 = OneMillion
+// lldbg-check:[...] OneMillion
 // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_million = c_style_enum::ManualDiscriminant::OneMillion
 
 // lldb-command:print single_variant
-// lldbg-check:[...]$6 = TheOnlyVariant
+// lldbg-check:[...] TheOnlyVariant
 // lldbr-check:(c_style_enum::SingleVariant) single_variant = c_style_enum::SingleVariant::TheOnlyVariant
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/captured-fields-1.rs b/tests/debuginfo/captured-fields-1.rs
index f5fdf4fb3d9..bcc5a179687 100644
--- a/tests/debuginfo/captured-fields-1.rs
+++ b/tests/debuginfo/captured-fields-1.rs
@@ -26,22 +26,22 @@
 
 // lldb-command:run
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#0}) $0 = { _ref__my_ref__my_field1 = 0x[...] }
+// lldbg-check:(captured_fields_1::main::{closure_env#0}) { _ref__my_ref__my_field1 = 0x[...] }
 // lldb-command:continue
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#1}) $1 = { _ref__my_ref__my_field2 = 0x[...] }
+// lldbg-check:(captured_fields_1::main::{closure_env#1}) { _ref__my_ref__my_field2 = 0x[...] }
 // lldb-command:continue
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#2}) $2 = { _ref__my_ref = 0x[...] }
+// lldbg-check:(captured_fields_1::main::{closure_env#2}) { _ref__my_ref = 0x[...] }
 // lldb-command:continue
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#3}) $3 = { my_ref = 0x[...] }
+// lldbg-check:(captured_fields_1::main::{closure_env#3}) { my_ref = 0x[...] }
 // lldb-command:continue
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#4}) $4 = { my_var__my_field2 = 22 }
+// lldbg-check:(captured_fields_1::main::{closure_env#4}) { my_var__my_field2 = 22 }
 // lldb-command:continue
 // lldb-command:print test
-// lldbg-check:(captured_fields_1::main::{closure_env#5}) $5 = { my_var = { my_field1 = 11 my_field2 = 22 } }
+// lldbg-check:(captured_fields_1::main::{closure_env#5}) { my_var = { my_field1 = 11 my_field2 = 22 } }
 // lldb-command:continue
 
 #![allow(unused)]
diff --git a/tests/debuginfo/captured-fields-2.rs b/tests/debuginfo/captured-fields-2.rs
index aaf4fa1bc45..7191d3f84d2 100644
--- a/tests/debuginfo/captured-fields-2.rs
+++ b/tests/debuginfo/captured-fields-2.rs
@@ -14,10 +14,10 @@
 
 // lldb-command:run
 // lldb-command:print my_ref__my_field1
-// lldbg-check:(unsigned int) $0 = 11
+// lldbg-check:(unsigned int) 11
 // lldb-command:continue
 // lldb-command:print my_var__my_field2
-// lldbg-check:(unsigned int) $1 = 22
+// lldbg-check:(unsigned int) 22
 // lldb-command:continue
 
 #![allow(unused)]
diff --git a/tests/debuginfo/closure-in-generic-function.rs b/tests/debuginfo/closure-in-generic-function.rs
index 676a624191c..c48858e4a0a 100644
--- a/tests/debuginfo/closure-in-generic-function.rs
+++ b/tests/debuginfo/closure-in-generic-function.rs
@@ -24,18 +24,18 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = 0.5
+// lldbg-check:[...] 0.5
 // lldbr-check:(f64) x = 0.5
 // lldb-command:print y
-// lldbg-check:[...]$1 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) y = 10
 // lldb-command:continue
 
 // lldb-command:print *x
-// lldbg-check:[...]$2 = 29
+// lldbg-check:[...] 29
 // lldbr-check:(i32) *x = 29
 // lldb-command:print *y
-// lldbg-check:[...]$3 = 110
+// lldbg-check:[...] 110
 // lldbr-check:(i32) *y = 110
 // lldb-command:continue
 
diff --git a/tests/debuginfo/coroutine-locals.rs b/tests/debuginfo/coroutine-locals.rs
index 0430e1d313b..80a68434dab 100644
--- a/tests/debuginfo/coroutine-locals.rs
+++ b/tests/debuginfo/coroutine-locals.rs
@@ -28,30 +28,30 @@
 
 // lldb-command:run
 // lldb-command:print a
-// lldbg-check:(int) $0 = 5
+// lldbg-check:(int) 5
 // lldbr-check:(int) a = 5
 // lldb-command:print c
-// lldbg-check:(int) $1 = 6
+// lldbg-check:(int) 6
 // lldbr-check:(int) c = 6
 // lldb-command:print d
-// lldbg-check:(int) $2 = 7
+// lldbg-check:(int) 7
 // lldbr-check:(int) d = 7
 // lldb-command:continue
 // lldb-command:print a
-// lldbg-check:(int) $3 = 7
+// lldbg-check:(int) 7
 // lldbr-check:(int) a = 7
 // lldb-command:print c
-// lldbg-check:(int) $4 = 6
+// lldbg-check:(int) 6
 // lldbr-check:(int) c = 6
 // lldb-command:print e
-// lldbg-check:(int) $5 = 8
+// lldbg-check:(int) 8
 // lldbr-check:(int) e = 8
 // lldb-command:continue
 // lldb-command:print a
-// lldbg-check:(int) $6 = 8
+// lldbg-check:(int) 8
 // lldbr-check:(int) a = 8
 // lldb-command:print c
-// lldbg-check:(int) $7 = 6
+// lldbg-check:(int) 6
 // lldbr-check:(int) c = 6
 
 #![feature(omit_gdb_pretty_printer_section, coroutines, coroutine_trait)]
diff --git a/tests/debuginfo/coroutine-objects.rs b/tests/debuginfo/coroutine-objects.rs
index 98b37ac2001..9f14cb3f8ec 100644
--- a/tests/debuginfo/coroutine-objects.rs
+++ b/tests/debuginfo/coroutine-objects.rs
@@ -26,16 +26,16 @@
 
 // lldb-command:run
 // lldb-command:print b
-// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) $0 =
+// lldbg-check:(coroutine_objects::main::{coroutine_env#0})
 // lldb-command:continue
 // lldb-command:print b
-// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) $1 =
+// lldbg-check:(coroutine_objects::main::{coroutine_env#0})
 // lldb-command:continue
 // lldb-command:print b
-// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) $2 =
+// lldbg-check:(coroutine_objects::main::{coroutine_env#0})
 // lldb-command:continue
 // lldb-command:print b
-// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) $3 =
+// lldbg-check:(coroutine_objects::main::{coroutine_env#0})
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs
index 75550e1794c..9f3538c4e1d 100644
--- a/tests/debuginfo/cross-crate-spans.rs
+++ b/tests/debuginfo/cross-crate-spans.rs
@@ -44,24 +44,24 @@ extern crate cross_crate_spans;
 // lldb-command:run
 
 // lldb-command:print result
-// lldbg-check:[...]$0 = { 0 = 17 1 = 17 }
+// lldbg-check:[...] { 0 = 17 1 = 17 }
 // lldbr-check:((u32, u32)) result = { 0 = 17 1 = 17 }
 // lldb-command:print a_variable
-// lldbg-check:[...]$1 = 123456789
+// lldbg-check:[...] 123456789
 // lldbr-check:(u32) a_variable = 123456789
 // lldb-command:print another_variable
-// lldbg-check:[...]$2 = 123456789.5
+// lldbg-check:[...] 123456789.5
 // lldbr-check:(f64) another_variable = 123456789.5
 // lldb-command:continue
 
 // lldb-command:print result
-// lldbg-check:[...]$3 = { 0 = 1212 1 = 1212 }
+// lldbg-check:[...] { 0 = 1212 1 = 1212 }
 // lldbr-check:((i16, i16)) result = { 0 = 1212 1 = 1212 }
 // lldb-command:print a_variable
-// lldbg-check:[...]$4 = 123456789
+// lldbg-check:[...] 123456789
 // lldbr-check:(u32) a_variable = 123456789
 // lldb-command:print another_variable
-// lldbg-check:[...]$5 = 123456789.5
+// 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 e6e697c518a..2748bdb08b9 100644
--- a/tests/debuginfo/destructured-fn-argument.rs
+++ b/tests/debuginfo/destructured-fn-argument.rs
@@ -164,195 +164,195 @@
 // lldb-command:run
 
 // lldb-command:print a
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) a = 1
 // lldb-command:print b
-// lldbg-check:[...]$1 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) b = false
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$2 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) a = 2
 // lldb-command:print b
-// lldbg-check:[...]$3 = 3
+// lldbg-check:[...] 3
 // lldbr-check:(u16) b = 3
 // lldb-command:print c
-// lldbg-check:[...]$4 = 4
+// lldbg-check:[...] 4
 // lldbr-check:(u16) c = 4
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$5 = 5
+// lldbg-check:[...] 5
 // lldbr-check:(isize) a = 5
 // lldb-command:print b
-// lldbg-check:[...]$6 = { 0 = 6 1 = 7 }
+// lldbg-check:[...] { 0 = 6 1 = 7 }
 // lldbr-check:((u32, u32)) b = { 0 = 6 1 = 7 }
 // lldb-command:continue
 
 // lldb-command:print h
-// lldbg-check:[...]$7 = 8
+// lldbg-check:[...] 8
 // lldbr-check:(i16) h = 8
 // lldb-command:print i
-// lldbg-check:[...]$8 = { a = 9 b = 10 }
+// lldbg-check:[...] { a = 9 b = 10 }
 // lldbr-check:(destructured_fn_argument::Struct) i = { a = 9 b = 10 }
 // lldb-command:print j
-// lldbg-check:[...]$9 = 11
+// lldbg-check:[...] 11
 // lldbr-check:(i16) j = 11
 // lldb-command:continue
 
 // lldb-command:print k
-// lldbg-check:[...]$10 = 12
+// lldbg-check:[...] 12
 // lldbr-check:(i64) k = 12
 // lldb-command:print l
-// lldbg-check:[...]$11 = 13
+// lldbg-check:[...] 13
 // lldbr-check:(i32) l = 13
 // lldb-command:continue
 
 // lldb-command:print m
-// lldbg-check:[...]$12 = 14
+// lldbg-check:[...] 14
 // lldbr-check:(isize) m = 14
 // lldb-command:print n
-// lldbg-check:[...]$13 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(i32) n = 16
 // lldb-command:continue
 
 // lldb-command:print o
-// lldbg-check:[...]$14 = 18
+// lldbg-check:[...] 18
 // lldbr-check:(i32) o = 18
 // lldb-command:continue
 
 // lldb-command:print p
-// lldbg-check:[...]$15 = 19
+// lldbg-check:[...] 19
 // lldbr-check:(i64) p = 19
 // lldb-command:print q
-// lldbg-check:[...]$16 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) q = 20
 // lldb-command:print r
-// lldbg-check:[...]$17 = { a = 21 b = 22 }
+// lldbg-check:[...] { a = 21 b = 22 }
 // lldbr-check:(destructured_fn_argument::Struct) r = { a = 21, b = 22 }
 // lldb-command:continue
 
 // lldb-command:print s
-// lldbg-check:[...]$18 = 24
+// lldbg-check:[...] 24
 // lldbr-check:(i32) s = 24
 // lldb-command:print t
-// lldbg-check:[...]$19 = 23
+// lldbg-check:[...] 23
 // lldbr-check:(i64) t = 23
 // lldb-command:continue
 
 // lldb-command:print u
-// lldbg-check:[...]$20 = 25
+// lldbg-check:[...] 25
 // lldbr-check:(i16) u = 25
 // lldb-command:print v
-// lldbg-check:[...]$21 = 26
+// lldbg-check:[...] 26
 // lldbr-check:(i32) v = 26
 // lldb-command:print w
-// lldbg-check:[...]$22 = 27
+// lldbg-check:[...] 27
 // lldbr-check:(i64) w = 27
 // lldb-command:print x
-// lldbg-check:[...]$23 = 28
+// lldbg-check:[...] 28
 // lldbr-check:(i32) x = 28
 // lldb-command:print y
-// lldbg-check:[...]$24 = 29
+// lldbg-check:[...] 29
 // lldbr-check:(i64) y = 29
 // lldb-command:print z
-// lldbg-check:[...]$25 = 30
+// lldbg-check:[...] 30
 // lldbr-check:(i32) z = 30
 // lldb-command:print ae
-// lldbg-check:[...]$26 = 31
+// lldbg-check:[...] 31
 // lldbr-check:(i64) ae = 31
 // lldb-command:print oe
-// lldbg-check:[...]$27 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(i32) oe = 32
 // lldb-command:print ue
-// lldbg-check:[...]$28 = 33
+// lldbg-check:[...] 33
 // lldbr-check:(u16) ue = 33
 // lldb-command:continue
 
 // lldb-command:print aa
-// lldbg-check:[...]$29 = { 0 = 34 1 = 35 }
+// lldbg-check:[...] { 0 = 34 1 = 35 }
 // lldbr-check:((isize, isize)) aa = { 0 = 34 1 = 35 }
 // lldb-command:continue
 
 // lldb-command:print bb
-// lldbg-check:[...]$30 = { 0 = 36 1 = 37 }
+// lldbg-check:[...] { 0 = 36 1 = 37 }
 // lldbr-check:((isize, isize)) bb = { 0 = 36 1 = 37 }
 // lldb-command:continue
 
 // lldb-command:print cc
-// lldbg-check:[...]$31 = 38
+// lldbg-check:[...] 38
 // lldbr-check:(isize) cc = 38
 // lldb-command:continue
 
 // lldb-command:print dd
-// lldbg-check:[...]$32 = { 0 = 40 1 = 41 2 = 42 }
+// 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:print *ee
-// lldbg-check:[...]$33 = { 0 = 43 1 = 44 2 = 45 }
+// 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:print *ff
-// lldbg-check:[...]$34 = 46
+// lldbg-check:[...] 46
 // lldbr-check:(isize) *ff = 46
 // lldb-command:print gg
-// lldbg-check:[...]$35 = { 0 = 47 1 = 48 }
+// lldbg-check:[...] { 0 = 47 1 = 48 }
 // lldbr-check:((isize, isize)) gg = { 0 = 47 1 = 48 }
 // lldb-command:continue
 
 // lldb-command:print *hh
-// lldbg-check:[...]$36 = 50
+// lldbg-check:[...] 50
 // lldbr-check:(i32) *hh = 50
 // lldb-command:continue
 
 // lldb-command:print ii
-// lldbg-check:[...]$37 = 51
+// lldbg-check:[...] 51
 // lldbr-check:(i32) ii = 51
 // lldb-command:continue
 
 // lldb-command:print *jj
-// lldbg-check:[...]$38 = 52
+// lldbg-check:[...] 52
 // lldbr-check:(i32) *jj = 52
 // lldb-command:continue
 
 // lldb-command:print kk
-// lldbg-check:[...]$39 = 53
+// lldbg-check:[...] 53
 // lldbr-check:(f64) kk = 53
 // lldb-command:print ll
-// lldbg-check:[...]$40 = 54
+// lldbg-check:[...] 54
 // lldbr-check:(isize) ll = 54
 // lldb-command:continue
 
 // lldb-command:print mm
-// lldbg-check:[...]$41 = 55
+// lldbg-check:[...] 55
 // lldbr-check:(f64) mm = 55
 // lldb-command:print *nn
-// lldbg-check:[...]$42 = 56
+// lldbg-check:[...] 56
 // lldbr-check:(isize) *nn = 56
 // lldb-command:continue
 
 // lldb-command:print oo
-// lldbg-check:[...]$43 = 57
+// lldbg-check:[...] 57
 // lldbr-check:(isize) oo = 57
 // lldb-command:print pp
-// lldbg-check:[...]$44 = 58
+// lldbg-check:[...] 58
 // lldbr-check:(isize) pp = 58
 // lldb-command:print qq
-// lldbg-check:[...]$45 = 59
+// lldbg-check:[...] 59
 // lldbr-check:(isize) qq = 59
 // lldb-command:continue
 
 // lldb-command:print rr
-// lldbg-check:[...]$46 = 60
+// lldbg-check:[...] 60
 // lldbr-check:(isize) rr = 60
 // lldb-command:print ss
-// lldbg-check:[...]$47 = 61
+// lldbg-check:[...] 61
 // lldbr-check:(isize) ss = 61
 // lldb-command:print tt
-// lldbg-check:[...]$48 = 62
+// lldbg-check:[...] 62
 // lldbr-check:(isize) tt = 62
 // lldb-command:continue
 
diff --git a/tests/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs
index 3e27d122c4b..e583804cb1e 100644
--- a/tests/debuginfo/destructured-for-loop-variable.rs
+++ b/tests/debuginfo/destructured-for-loop-variable.rs
@@ -85,89 +85,89 @@
 
 // DESTRUCTURED STRUCT
 // lldb-command:print x
-// lldbg-check:[...]$0 = 400
+// lldbg-check:[...] 400
 // lldbr-check:(i16) x = 400
 // lldb-command:print y
-// lldbg-check:[...]$1 = 401.5
+// lldbg-check:[...] 401.5
 // lldbr-check:(f32) y = 401.5
 // lldb-command:print z
-// lldbg-check:[...]$2 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) z = true
 // lldb-command:continue
 
 // DESTRUCTURED TUPLE
 // lldb-command:print _i8
-// lldbg-check:[...]$3 = 0x6f
+// lldbg-check:[...] 0x6f
 // lldbr-check:(i8) _i8 = 111
 // lldb-command:print _u8
-// lldbg-check:[...]$4 = 0x70
+// lldbg-check:[...] 0x70
 // lldbr-check:(u8) _u8 = 112
 // lldb-command:print _i16
-// lldbg-check:[...]$5 = -113
+// lldbg-check:[...] -113
 // lldbr-check:(i16) _i16 = -113
 // lldb-command:print _u16
-// lldbg-check:[...]$6 = 114
+// lldbg-check:[...] 114
 // lldbr-check:(u16) _u16 = 114
 // lldb-command:print _i32
-// lldbg-check:[...]$7 = -115
+// lldbg-check:[...] -115
 // lldbr-check:(i32) _i32 = -115
 // lldb-command:print _u32
-// lldbg-check:[...]$8 = 116
+// lldbg-check:[...] 116
 // lldbr-check:(u32) _u32 = 116
 // lldb-command:print _i64
-// lldbg-check:[...]$9 = -117
+// lldbg-check:[...] -117
 // lldbr-check:(i64) _i64 = -117
 // lldb-command:print _u64
-// lldbg-check:[...]$10 = 118
+// lldbg-check:[...] 118
 // lldbr-check:(u64) _u64 = 118
 // lldb-command:print _f32
-// lldbg-check:[...]$11 = 119.5
+// lldbg-check:[...] 119.5
 // lldbr-check:(f32) _f32 = 119.5
 // lldb-command:print _f64
-// lldbg-check:[...]$12 = 120.5
+// lldbg-check:[...] 120.5
 // lldbr-check:(f64) _f64 = 120.5
 // lldb-command:continue
 
 // MORE COMPLEX CASE
 // lldb-command:print v1
-// lldbg-check:[...]$13 = 80000
+// lldbg-check:[...] 80000
 // lldbr-check:(i32) v1 = 80000
 // lldb-command:print x1
-// lldbg-check:[...]$14 = 8000
+// lldbg-check:[...] 8000
 // lldbr-check:(i16) x1 = 8000
 // lldb-command:print *y1
-// lldbg-check:[...]$15 = 80001.5
+// lldbg-check:[...] 80001.5
 // lldbr-check:(f32) *y1 = 80001.5
 // lldb-command:print z1
-// lldbg-check:[...]$16 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) z1 = false
 // lldb-command:print *x2
-// lldbg-check:[...]$17 = -30000
+// lldbg-check:[...] -30000
 // lldbr-check:(i16) *x2 = -30000
 // lldb-command:print y2
-// lldbg-check:[...]$18 = -300001.5
+// lldbg-check:[...] -300001.5
 // lldbr-check:(f32) y2 = -300001.5
 // lldb-command:print *z2
-// lldbg-check:[...]$19 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) *z2 = true
 // lldb-command:print v2
-// lldbg-check:[...]$20 = 854237.5
+// lldbg-check:[...] 854237.5
 // lldbr-check:(f64) v2 = 854237.5
 // lldb-command:continue
 
 // SIMPLE IDENTIFIER
 // lldb-command:print i
-// lldbg-check:[...]$21 = 1234
+// lldbg-check:[...] 1234
 // lldbr-check:(i32) i = 1234
 // lldb-command:continue
 
 // lldb-command:print simple_struct_ident
-// lldbg-check:[...]$22 = { x = 3537 y = 35437.5 z = true }
+// 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:print simple_tuple_ident
-// lldbg-check:[...]$23 = { 0 = 34903493 1 = 232323 }
+// lldbg-check:[...] { 0 = 34903493 1 = 232323 }
 // lldbr-check:((u32, i64)) simple_tuple_ident = { 0 = 34903493 1 = 232323 }
 // lldb-command:continue
 
diff --git a/tests/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs
index 3e0557382b3..9993407815e 100644
--- a/tests/debuginfo/destructured-local.rs
+++ b/tests/debuginfo/destructured-local.rs
@@ -130,156 +130,156 @@
 // lldb-command:run
 
 // lldb-command:print a
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) a = 1
 // lldb-command:print b
-// lldbg-check:[...]$1 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) b = false
 
 // lldb-command:print c
-// lldbg-check:[...]$2 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) c = 2
 // lldb-command:print d
-// lldbg-check:[...]$3 = 3
+// lldbg-check:[...] 3
 // lldbr-check:(u16) d = 3
 // lldb-command:print e
-// lldbg-check:[...]$4 = 4
+// lldbg-check:[...] 4
 // lldbr-check:(u16) e = 4
 
 // lldb-command:print f
-// lldbg-check:[...]$5 = 5
+// lldbg-check:[...] 5
 // lldbr-check:(isize) f = 5
 // lldb-command:print g
-// lldbg-check:[...]$6 = { 0 = 6 1 = 7 }
+// lldbg-check:[...] { 0 = 6 1 = 7 }
 // lldbr-check:((u32, u32)) g = { 0 = 6 1 = 7 }
 
 // lldb-command:print h
-// lldbg-check:[...]$7 = 8
+// lldbg-check:[...] 8
 // lldbr-check:(i16) h = 8
 // lldb-command:print i
-// lldbg-check:[...]$8 = { a = 9 b = 10 }
+// lldbg-check:[...] { a = 9 b = 10 }
 // lldbr-check:(destructured_local::Struct) i = { a = 9 b = 10 }
 // lldb-command:print j
-// lldbg-check:[...]$9 = 11
+// lldbg-check:[...] 11
 // lldbr-check:(i16) j = 11
 
 // lldb-command:print k
-// lldbg-check:[...]$10 = 12
+// lldbg-check:[...] 12
 // lldbr-check:(i64) k = 12
 // lldb-command:print l
-// lldbg-check:[...]$11 = 13
+// lldbg-check:[...] 13
 // lldbr-check:(i32) l = 13
 
 // lldb-command:print m
-// lldbg-check:[...]$12 = 14
+// lldbg-check:[...] 14
 // lldbr-check:(i32) m = 14
 // lldb-command:print n
-// lldbg-check:[...]$13 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(i32) n = 16
 
 // lldb-command:print o
-// lldbg-check:[...]$14 = 18
+// lldbg-check:[...] 18
 // lldbr-check:(i32) o = 18
 
 // lldb-command:print p
-// lldbg-check:[...]$15 = 19
+// lldbg-check:[...] 19
 // lldbr-check:(i64) p = 19
 // lldb-command:print q
-// lldbg-check:[...]$16 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) q = 20
 // lldb-command:print r
-// lldbg-check:[...]$17 = { a = 21 b = 22 }
+// lldbg-check:[...] { a = 21 b = 22 }
 // lldbr-check:(destructured_local::Struct) r = { a = 21 b = 22 }
 
 // lldb-command:print s
-// lldbg-check:[...]$18 = 24
+// lldbg-check:[...] 24
 // lldbr-check:(i32) s = 24
 // lldb-command:print t
-// lldbg-check:[...]$19 = 23
+// lldbg-check:[...] 23
 // lldbr-check:(i64) t = 23
 
 // lldb-command:print u
-// lldbg-check:[...]$20 = 25
+// lldbg-check:[...] 25
 // lldbr-check:(i32) u = 25
 // lldb-command:print v
-// lldbg-check:[...]$21 = 26
+// lldbg-check:[...] 26
 // lldbr-check:(i32) v = 26
 // lldb-command:print w
-// lldbg-check:[...]$22 = 27
+// lldbg-check:[...] 27
 // lldbr-check:(i32) w = 27
 // lldb-command:print x
-// lldbg-check:[...]$23 = 28
+// lldbg-check:[...] 28
 // lldbr-check:(i32) x = 28
 // lldb-command:print y
-// lldbg-check:[...]$24 = 29
+// lldbg-check:[...] 29
 // lldbr-check:(i64) y = 29
 // lldb-command:print z
-// lldbg-check:[...]$25 = 30
+// lldbg-check:[...] 30
 // lldbr-check:(i32) z = 30
 // lldb-command:print ae
-// lldbg-check:[...]$26 = 31
+// lldbg-check:[...] 31
 // lldbr-check:(i64) ae = 31
 // lldb-command:print oe
-// lldbg-check:[...]$27 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(i32) oe = 32
 // lldb-command:print ue
-// lldbg-check:[...]$28 = 33
+// lldbg-check:[...] 33
 // lldbr-check:(i32) ue = 33
 
 // lldb-command:print aa
-// lldbg-check:[...]$29 = { 0 = 34 1 = 35 }
+// lldbg-check:[...] { 0 = 34 1 = 35 }
 // lldbr-check:((i32, i32)) aa = { 0 = 34 1 = 35 }
 
 // lldb-command:print bb
-// lldbg-check:[...]$30 = { 0 = 36 1 = 37 }
+// lldbg-check:[...] { 0 = 36 1 = 37 }
 // lldbr-check:((i32, i32)) bb = { 0 = 36 1 = 37 }
 
 // lldb-command:print cc
-// lldbg-check:[...]$31 = 38
+// lldbg-check:[...] 38
 // lldbr-check:(i32) cc = 38
 
 // lldb-command:print dd
-// lldbg-check:[...]$32 = { 0 = 40 1 = 41 2 = 42 }
+// lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 }
 // lldbr-check:((i32, i32, i32)) dd = { 0 = 40 1 = 41 2 = 42}
 
 // lldb-command:print *ee
-// lldbg-check:[...]$33 = { 0 = 43 1 = 44 2 = 45 }
+// lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 }
 // lldbr-check:((i32, i32, i32)) *ee = { 0 = 43 1 = 44 2 = 45}
 
 // lldb-command:print *ff
-// lldbg-check:[...]$34 = 46
+// lldbg-check:[...] 46
 // lldbr-check:(i32) *ff = 46
 
 // lldb-command:print gg
-// lldbg-check:[...]$35 = { 0 = 47 1 = 48 }
+// lldbg-check:[...] { 0 = 47 1 = 48 }
 // lldbr-check:((i32, i32)) gg = { 0 = 47 1 = 48 }
 
 // lldb-command:print *hh
-// lldbg-check:[...]$36 = 50
+// lldbg-check:[...] 50
 // lldbr-check:(i32) *hh = 50
 
 // lldb-command:print ii
-// lldbg-check:[...]$37 = 51
+// lldbg-check:[...] 51
 // lldbr-check:(i32) ii = 51
 
 // lldb-command:print *jj
-// lldbg-check:[...]$38 = 52
+// lldbg-check:[...] 52
 // lldbr-check:(i32) *jj = 52
 
 // lldb-command:print kk
-// lldbg-check:[...]$39 = 53
+// lldbg-check:[...] 53
 // lldbr-check:(f64) kk = 53
 
 // lldb-command:print ll
-// lldbg-check:[...]$40 = 54
+// lldbg-check:[...] 54
 // lldbr-check:(isize) ll = 54
 
 // lldb-command:print mm
-// lldbg-check:[...]$41 = 55
+// lldbg-check:[...] 55
 // lldbr-check:(f64) mm = 55
 
 // lldb-command:print *nn
-// lldbg-check:[...]$42 = 56
+// lldbg-check:[...] 56
 // lldbr-check:(isize) *nn = 56
 
 
diff --git a/tests/debuginfo/drop-locations.rs b/tests/debuginfo/drop-locations.rs
index 6404bf9c3da..15b2d0de7fe 100644
--- a/tests/debuginfo/drop-locations.rs
+++ b/tests/debuginfo/drop-locations.rs
@@ -43,22 +43,22 @@
 // lldb-command:run
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc1[...]
+// lldb-check:[...] #loc1 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc2[...]
+// lldb-check:[...] #loc2 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc3[...]
+// lldb-check:[...] #loc3 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc4[...]
+// lldb-check:[...] #loc4 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc5[...]
+// lldb-check:[...] #loc5 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc6[...]
+// lldb-check:[...] #loc6 [...]
 
 fn main() {
 
diff --git a/tests/debuginfo/empty-string.rs b/tests/debuginfo/empty-string.rs
index 838e160e74e..2afdfc8ad04 100644
--- a/tests/debuginfo/empty-string.rs
+++ b/tests/debuginfo/empty-string.rs
@@ -20,10 +20,10 @@
 // lldb-command: run
 
 // lldb-command: fr v empty_string
-// lldb-check:[...]empty_string = "" { vec = size=0 }
+// lldb-check:[...] empty_string = "" { vec = size=0 }
 
 // lldb-command: fr v empty_str
-// lldb-check:[...]empty_str = "" { data_ptr = [...] length = 0 }
+// lldb-check:[...] empty_str = "" { data_ptr = [...] length = 0 }
 
 fn main() {
     let empty_string = String::new();
diff --git a/tests/debuginfo/enum-thinlto.rs b/tests/debuginfo/enum-thinlto.rs
index 5c27fe4271c..2e541663147 100644
--- a/tests/debuginfo/enum-thinlto.rs
+++ b/tests/debuginfo/enum-thinlto.rs
@@ -15,7 +15,7 @@
 // lldb-command:run
 
 // lldb-command:print *abc
-// lldbg-check:(enum_thinlto::ABC) $0 =
+// lldbg-check:(enum_thinlto::ABC)
 // lldbr-check:(enum_thinlto::ABC) *abc = (x = 0, y = 8970181431921507452)
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/evec-in-struct.rs b/tests/debuginfo/evec-in-struct.rs
index d238cc9eded..0e6565830a9 100644
--- a/tests/debuginfo/evec-in-struct.rs
+++ b/tests/debuginfo/evec-in-struct.rs
@@ -31,22 +31,22 @@
 // lldb-command:run
 
 // lldb-command:print no_padding1
-// lldbg-check:[...]$0 = { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } }
+// 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:print no_padding2
-// lldbg-check:[...]$1 = { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } }
+// 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:print struct_internal_padding
-// lldbg-check:[...]$2 = { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } }
+// 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:print single_vec
-// lldbg-check:[...]$3 = { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } }
+// 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:print struct_padded_at_end
-// lldbg-check:[...]$4 = { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } }
+// 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)]
diff --git a/tests/debuginfo/extern-c-fn.rs b/tests/debuginfo/extern-c-fn.rs
index 62c2b609969..0d2eb9e6daf 100644
--- a/tests/debuginfo/extern-c-fn.rs
+++ b/tests/debuginfo/extern-c-fn.rs
@@ -22,16 +22,16 @@
 // lldb-command:run
 
 // lldb-command:print len
-// lldbg-check:[...]$0 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) len = 20
 // lldb-command:print local0
-// lldbg-check:[...]$1 = 19
+// lldbg-check:[...] 19
 // lldbr-check:(i32) local0 = 19
 // lldb-command:print local1
-// lldbg-check:[...]$2 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) local1 = true
 // lldb-command:print local2
-// lldbg-check:[...]$3 = 20.5
+// lldbg-check:[...] 20.5
 // lldbr-check:(f64) local2 = 20.5
 
 // lldb-command:continue
diff --git a/tests/debuginfo/function-arg-initialization.rs b/tests/debuginfo/function-arg-initialization.rs
index 4bdaefd9bdd..5288aa2e6f1 100644
--- a/tests/debuginfo/function-arg-initialization.rs
+++ b/tests/debuginfo/function-arg-initialization.rs
@@ -120,99 +120,99 @@
 
 // IMMEDIATE ARGS
 // lldb-command:print a
-// lldb-check:[...]$0 = 1
+// lldb-check:[...] 1
 // lldb-command:print b
-// lldb-check:[...]$1 = true
+// lldb-check:[...] true
 // lldb-command:print c
-// lldb-check:[...]$2 = 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // NON IMMEDIATE ARGS
 // lldb-command:print a
-// lldb-check:[...]$3 = BigStruct { a: 3, b: 4, c: 5, d: 6, e: 7, f: 8, g: 9, h: 10 }
+// lldb-check:[...] BigStruct { a: 3, b: 4, c: 5, d: 6, e: 7, f: 8, g: 9, h: 10 }
 // lldb-command:print b
-// lldb-check:[...]$4 = BigStruct { a: 11, b: 12, c: 13, d: 14, e: 15, f: 16, g: 17, h: 18 }
+// lldb-check:[...] BigStruct { a: 11, b: 12, c: 13, d: 14, e: 15, f: 16, g: 17, h: 18 }
 // lldb-command:continue
 
 // BINDING
 // lldb-command:print a
-// lldb-check:[...]$5 = 19
+// lldb-check:[...] 19
 // lldb-command:print b
-// lldb-check:[...]$6 = 20
+// lldb-check:[...] 20
 // lldb-command:print c
-// lldb-check:[...]$7 = 21.5
+// lldb-check:[...] 21.5
 // lldb-command:continue
 
 // ASSIGNMENT
 // lldb-command:print a
-// lldb-check:[...]$8 = 22
+// lldb-check:[...] 22
 // lldb-command:print b
-// lldb-check:[...]$9 = 23
+// lldb-check:[...] 23
 // lldb-command:print c
-// lldb-check:[...]$10 = 24.5
+// lldb-check:[...] 24.5
 // lldb-command:continue
 
 // FUNCTION CALL
 // lldb-command:print x
-// lldb-check:[...]$11 = 25
+// lldb-check:[...] 25
 // lldb-command:print y
-// lldb-check:[...]$12 = 26
+// lldb-check:[...] 26
 // lldb-command:print z
-// lldb-check:[...]$13 = 27.5
+// lldb-check:[...] 27.5
 // lldb-command:continue
 
 // EXPR
 // lldb-command:print x
-// lldb-check:[...]$14 = 28
+// lldb-check:[...] 28
 // lldb-command:print y
-// lldb-check:[...]$15 = 29
+// lldb-check:[...] 29
 // lldb-command:print z
-// lldb-check:[...]$16 = 30.5
+// lldb-check:[...] 30.5
 // lldb-command:continue
 
 // RETURN EXPR
 // lldb-command:print x
-// lldb-check:[...]$17 = 31
+// lldb-check:[...] 31
 // lldb-command:print y
-// lldb-check:[...]$18 = 32
+// lldb-check:[...] 32
 // lldb-command:print z
-// lldb-check:[...]$19 = 33.5
+// lldb-check:[...] 33.5
 // lldb-command:continue
 
 // ARITHMETIC EXPR
 // lldb-command:print x
-// lldb-check:[...]$20 = 34
+// lldb-check:[...] 34
 // lldb-command:print y
-// lldb-check:[...]$21 = 35
+// lldb-check:[...] 35
 // lldb-command:print z
-// lldb-check:[...]$22 = 36.5
+// lldb-check:[...] 36.5
 // lldb-command:continue
 
 // IF EXPR
 // lldb-command:print x
-// lldb-check:[...]$23 = 37
+// lldb-check:[...] 37
 // lldb-command:print y
-// lldb-check:[...]$24 = 38
+// lldb-check:[...] 38
 // lldb-command:print z
-// lldb-check:[...]$25 = 39.5
+// lldb-check:[...] 39.5
 // lldb-command:continue
 
 // WHILE EXPR
 // lldb-command:print x
-// lldb-check:[...]$26 = 40
+// lldb-check:[...] 40
 // lldb-command:print y
-// lldb-check:[...]$27 = 41
+// lldb-check:[...] 41
 // lldb-command:print z
-// lldb-check:[...]$28 = 42
+// lldb-check:[...] 42
 // lldb-command:continue
 
 // LOOP EXPR
 // lldb-command:print x
-// lldb-check:[...]$29 = 43
+// lldb-check:[...] 43
 // lldb-command:print y
-// lldb-check:[...]$30 = 44
+// lldb-check:[...] 44
 // lldb-command:print z
-// lldb-check:[...]$31 = 45
+// lldb-check:[...] 45
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/function-arguments.rs b/tests/debuginfo/function-arguments.rs
index c6b865bd458..84271d07b38 100644
--- a/tests/debuginfo/function-arguments.rs
+++ b/tests/debuginfo/function-arguments.rs
@@ -23,18 +23,18 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = 111102
+// lldbg-check:[...] 111102
 // lldbr-check:(isize) x = 111102
 // lldb-command:print y
-// lldbg-check:[...]$1 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$2 = 2000
+// lldbg-check:[...] 2000
 // lldbr-check:(i32) a = 2000
 // lldb-command:print b
-// lldbg-check:[...]$3 = 3000
+// lldbg-check:[...] 3000
 // lldbr-check:(i64) b = 3000
 // lldb-command:continue
 
diff --git a/tests/debuginfo/function-prologue-stepping-regular.rs b/tests/debuginfo/function-prologue-stepping-regular.rs
index e52d17a70bd..02567fd013e 100644
--- a/tests/debuginfo/function-prologue-stepping-regular.rs
+++ b/tests/debuginfo/function-prologue-stepping-regular.rs
@@ -21,99 +21,99 @@
 
 // IMMEDIATE ARGS
 // lldb-command:print a
-// lldb-check:[...]$0 = 1
+// lldb-check:[...] 1
 // lldb-command:print b
-// lldb-check:[...]$1 = true
+// lldb-check:[...] true
 // lldb-command:print c
-// lldb-check:[...]$2 = 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // NON IMMEDIATE ARGS
 // lldb-command:print a
-// lldb-check:[...]$3 = { a = 3, b = 4, c = 5, d = 6, e = 7, f = 8, g = 9, h = 10 }
+// lldb-check:[...] { a = 3, b = 4, c = 5, d = 6, e = 7, f = 8, g = 9, h = 10 }
 // lldb-command:print b
-// lldb-check:[...]$4 = { a = 11, b = 12, c = 13, d = 14, e = 15, f = 16, g = 17, h = 18 }
+// lldb-check:[...] { a = 11, b = 12, c = 13, d = 14, e = 15, f = 16, g = 17, h = 18 }
 // lldb-command:continue
 
 // BINDING
 // lldb-command:print a
-// lldb-check:[...]$5 = 19
+// lldb-check:[...] 19
 // lldb-command:print b
-// lldb-check:[...]$6 = 20
+// lldb-check:[...] 20
 // lldb-command:print c
-// lldb-check:[...]$7 = 21.5
+// lldb-check:[...] 21.5
 // lldb-command:continue
 
 // ASSIGNMENT
 // lldb-command:print a
-// lldb-check:[...]$8 = 22
+// lldb-check:[...] 22
 // lldb-command:print b
-// lldb-check:[...]$9 = 23
+// lldb-check:[...] 23
 // lldb-command:print c
-// lldb-check:[...]$10 = 24.5
+// lldb-check:[...] 24.5
 // lldb-command:continue
 
 // FUNCTION CALL
 // lldb-command:print x
-// lldb-check:[...]$11 = 25
+// lldb-check:[...] 25
 // lldb-command:print y
-// lldb-check:[...]$12 = 26
+// lldb-check:[...] 26
 // lldb-command:print z
-// lldb-check:[...]$13 = 27.5
+// lldb-check:[...] 27.5
 // lldb-command:continue
 
 // EXPR
 // lldb-command:print x
-// lldb-check:[...]$14 = 28
+// lldb-check:[...] 28
 // lldb-command:print y
-// lldb-check:[...]$15 = 29
+// lldb-check:[...] 29
 // lldb-command:print z
-// lldb-check:[...]$16 = 30.5
+// lldb-check:[...] 30.5
 // lldb-command:continue
 
 // RETURN EXPR
 // lldb-command:print x
-// lldb-check:[...]$17 = 31
+// lldb-check:[...] 31
 // lldb-command:print y
-// lldb-check:[...]$18 = 32
+// lldb-check:[...] 32
 // lldb-command:print z
-// lldb-check:[...]$19 = 33.5
+// lldb-check:[...] 33.5
 // lldb-command:continue
 
 // ARITHMETIC EXPR
 // lldb-command:print x
-// lldb-check:[...]$20 = 34
+// lldb-check:[...] 34
 // lldb-command:print y
-// lldb-check:[...]$21 = 35
+// lldb-check:[...] 35
 // lldb-command:print z
-// lldb-check:[...]$22 = 36.5
+// lldb-check:[...] 36.5
 // lldb-command:continue
 
 // IF EXPR
 // lldb-command:print x
-// lldb-check:[...]$23 = 37
+// lldb-check:[...] 37
 // lldb-command:print y
-// lldb-check:[...]$24 = 38
+// lldb-check:[...] 38
 // lldb-command:print z
-// lldb-check:[...]$25 = 39.5
+// lldb-check:[...] 39.5
 // lldb-command:continue
 
 // WHILE EXPR
 // lldb-command:print x
-// lldb-check:[...]$26 = 40
+// lldb-check:[...] 40
 // lldb-command:print y
-// lldb-check:[...]$27 = 41
+// lldb-check:[...] 41
 // lldb-command:print z
-// lldb-check:[...]$28 = 42
+// lldb-check:[...] 42
 // lldb-command:continue
 
 // LOOP EXPR
 // lldb-command:print x
-// lldb-check:[...]$29 = 43
+// lldb-check:[...] 43
 // lldb-command:print y
-// lldb-check:[...]$30 = 44
+// lldb-check:[...] 44
 // lldb-command:print z
-// lldb-check:[...]$31 = 45
+// lldb-check:[...] 45
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/generic-enum-with-different-disr-sizes.rs b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs
index 6a8aa831c40..a7e97194e5d 100644
--- a/tests/debuginfo/generic-enum-with-different-disr-sizes.rs
+++ b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs
@@ -40,22 +40,22 @@
 // lldb-command:run
 
 // lldb-command:print eight_bytes1
-// lldb-check:[...]$0 = Variant1(100)
+// lldb-check:[...] Variant1(100)
 // lldb-command:print four_bytes1
-// lldb-check:[...]$1 = Variant1(101)
+// lldb-check:[...] Variant1(101)
 // lldb-command:print two_bytes1
-// lldb-check:[...]$2 = Variant1(102)
+// lldb-check:[...] Variant1(102)
 // lldb-command:print one_byte1
-// lldb-check:[...]$3 = Variant1('A')
+// lldb-check:[...] Variant1('A')
 
 // lldb-command:print eight_bytes2
-// lldb-check:[...]$4 = Variant2(100)
+// lldb-check:[...] Variant2(100)
 // lldb-command:print four_bytes2
-// lldb-check:[...]$5 = Variant2(101)
+// lldb-check:[...] Variant2(101)
 // lldb-command:print two_bytes2
-// lldb-check:[...]$6 = Variant2(102)
+// lldb-check:[...] Variant2(102)
 // lldb-command:print one_byte2
-// lldb-check:[...]$7 = Variant2('A')
+// lldb-check:[...] Variant2('A')
 
 // lldb-command:continue
 
diff --git a/tests/debuginfo/generic-function.rs b/tests/debuginfo/generic-function.rs
index eab781d2150..5c33d0d8520 100644
--- a/tests/debuginfo/generic-function.rs
+++ b/tests/debuginfo/generic-function.rs
@@ -30,26 +30,26 @@
 // lldb-command:run
 
 // lldb-command:print *t0
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) *t0 = 1
 // lldb-command:print *t1
-// lldbg-check:[...]$1 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f64) *t1 = 2.5
 // lldb-command:continue
 
 // lldb-command:print *t0
-// lldbg-check:[...]$2 = 3.5
+// lldbg-check:[...] 3.5
 // lldbr-check:(f64) *t0 = 3.5
 // lldb-command:print *t1
-// lldbg-check:[...]$3 = 4
+// lldbg-check:[...] 4
 // lldbr-check:(u16) *t1 = 4
 // lldb-command:continue
 
 // lldb-command:print *t0
-// lldbg-check:[...]$4 = 5
+// lldbg-check:[...] 5
 // lldbr-check:(i32) *t0 = 5
 // lldb-command:print *t1
-// lldbg-check:[...]$5 = { a = 6 b = 7.5 }
+// lldbg-check:[...] { a = 6 b = 7.5 }
 // lldbr-check:(generic_function::Struct) *t1 = { a = 6 b = 7.5 }
 // lldb-command:continue
 
diff --git a/tests/debuginfo/generic-functions-nested.rs b/tests/debuginfo/generic-functions-nested.rs
index a146015246e..4be0ab80f65 100644
--- a/tests/debuginfo/generic-functions-nested.rs
+++ b/tests/debuginfo/generic-functions-nested.rs
@@ -36,34 +36,34 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) x = -1
 // lldb-command:print y
-// lldbg-check:[...]$1 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) y = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) x = -1
 // lldb-command:print y
-// lldbg-check:[...]$3 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f64) y = 2.5
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = -2.5
+// lldbg-check:[...] -2.5
 // lldbr-check:(f64) x = -2.5
 // lldb-command:print y
-// lldbg-check:[...]$5 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) y = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$6 = -2.5
+// lldbg-check:[...] -2.5
 // lldbr-check:(f64) x = -2.5
 // lldb-command:print y
-// lldbg-check:[...]$7 = 2.5
+// 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 dd1f482f3fa..dea1c17ad41 100644
--- a/tests/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
@@ -65,61 +65,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { x = { 0 = 8888, 1 = -8888 } }
+// 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:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(u16) arg2 = 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { x = { 0 = 8888, 1 = -8888 } }
+// 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:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(i16) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { x = 1234.5 }
+// lldbg-check:[...] { x = 1234.5 }
 // lldbr-check:(generic_method_on_generic_struct::Struct<f64>) *self = { x = 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(i32) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { x = 1234.5 }
+// lldbg-check:[...] { x = 1234.5 }
 // lldbr-check:(generic_method_on_generic_struct::Struct<f64>) self = { x = 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(i64) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { x = 1234.5 }
+// lldbg-check:[...] { x = 1234.5 }
 // lldbr-check:(generic_method_on_generic_struct::Struct<f64>) *self = { x = 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10.5
+// lldbg-check:[...] -10.5
 // lldbr-check:(f32) arg2 = -10.5
 // lldb-command:continue
 
diff --git a/tests/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs
index 82ed17618aa..4c442feec6a 100644
--- a/tests/debuginfo/generic-struct.rs
+++ b/tests/debuginfo/generic-struct.rs
@@ -26,17 +26,17 @@
 // lldb-command:run
 
 // lldb-command:print int_int
-// lldbg-check:[...]$0 = AGenericStruct<i32, i32> { key: 0, value: 1 }
+// 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:print int_float
-// lldbg-check:[...]$1 = AGenericStruct<i32, f64> { key: 2, value: 3.5 }
+// 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:print float_int
-// lldbg-check:[...]$2 = AGenericStruct<f64, i32> { key: 4.5, value: 5 }
+// 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:print float_int_float
-// lldbg-check:[...]$3 = AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
+// 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/include_string.rs b/tests/debuginfo/include_string.rs
index 6f7d2b28b41..77b2d7dec5f 100644
--- a/tests/debuginfo/include_string.rs
+++ b/tests/debuginfo/include_string.rs
@@ -16,13 +16,13 @@
 // lldb-command:run
 
 // lldb-command:print string1.length
-// lldbg-check:[...]$0 = 48
+// lldbg-check:[...] 48
 // lldbr-check:(usize) length = 48
 // lldb-command:print string2.length
-// lldbg-check:[...]$1 = 49
+// lldbg-check:[...] 49
 // lldbr-check:(usize) length = 49
 // lldb-command:print string3.length
-// lldbg-check:[...]$2 = 50
+// 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 acbe2b12a24..375967f2072 100644
--- a/tests/debuginfo/issue-22656.rs
+++ b/tests/debuginfo/issue-22656.rs
@@ -11,10 +11,10 @@
 // lldb-command:run
 
 // lldb-command:print v
-// lldbg-check:[...]$0 = size=3 { [0] = 1 [1] = 2 [2] = 3 }
+// 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:print zs
-// lldbg-check:[...]$1 = { x = y = 123 z = w = 456 }
+// lldbg-check:[...] { x = y = 123 z = w = 456 }
 // lldbr-check:(issue_22656::StructWithZeroSizedField) zs = { x = y = 123 z = w = 456 }
 // lldbr-command:continue
 
diff --git a/tests/debuginfo/issue-57822.rs b/tests/debuginfo/issue-57822.rs
index f4ef45f1d74..5d0973c1d6b 100644
--- a/tests/debuginfo/issue-57822.rs
+++ b/tests/debuginfo/issue-57822.rs
@@ -21,10 +21,10 @@
 // lldb-command:run
 
 // lldb-command:print g
-// lldbg-check:(issue_57822::main::{closure_env#1}) $0 = { f = { x = 1 } }
+// lldbg-check:(issue_57822::main::{closure_env#1}) { f = { x = 1 } }
 
 // lldb-command:print b
-// lldbg-check:(issue_57822::main::{coroutine_env#3}) $1 =
+// lldbg-check:(issue_57822::main::{coroutine_env#3})
 
 #![feature(omit_gdb_pretty_printer_section, coroutines, coroutine_trait)]
 #![omit_gdb_pretty_printer_section]
diff --git a/tests/debuginfo/lexical-scope-in-for-loop.rs b/tests/debuginfo/lexical-scope-in-for-loop.rs
index 93be5288a64..6d8ff2970ef 100644
--- a/tests/debuginfo/lexical-scope-in-for-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-for-loop.rs
@@ -45,40 +45,40 @@
 
 // FIRST ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) x = -1
 // lldb-command:continue
 
 // SECOND ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$2 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(i32) x = -2
 // lldb-command:continue
 
 // THIRD ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$4 = 3
+// lldbg-check:[...] 3
 // lldbr-check:(i32) x = 3
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(i32) x = -3
 // lldb-command:continue
 
 // AFTER LOOP
 // lldb-command:print x
-// lldbg-check:[...]$6 = 1000000
+// lldbg-check:[...] 1000000
 // lldbr-check:(i32) x = 1000000
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-in-if.rs b/tests/debuginfo/lexical-scope-in-if.rs
index 88b4244a503..3e473acbda2 100644
--- a/tests/debuginfo/lexical-scope-in-if.rs
+++ b/tests/debuginfo/lexical-scope-in-if.rs
@@ -69,73 +69,73 @@
 
 // BEFORE if
 // lldb-command:print x
-// lldbg-check:[...]$0 = 999
+// lldbg-check:[...] 999
 // lldbr-check:(i32) x = 999
 // lldb-command:print y
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AT BEGINNING of 'then' block
 // lldb-command:print x
-// lldbg-check:[...]$2 = 999
+// lldbg-check:[...] 999
 // lldbr-check:(i32) x = 999
 // lldb-command:print y
-// lldbg-check:[...]$3 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AFTER 1st redeclaration of 'x'
 // lldb-command:print x
-// lldbg-check:[...]$4 = 1001
+// lldbg-check:[...] 1001
 // lldbr-check:(i32) x = 1001
 // lldb-command:print y
-// lldbg-check:[...]$5 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // AFTER 2st redeclaration of 'x'
 // lldb-command:print x
-// lldbg-check:[...]$6 = 1002
+// lldbg-check:[...] 1002
 // lldbr-check:(i32) x = 1002
 // lldb-command:print y
-// lldbg-check:[...]$7 = 1003
+// lldbg-check:[...] 1003
 // lldbr-check:(i32) y = 1003
 // lldb-command:continue
 
 // AFTER 1st if expression
 // lldb-command:print x
-// lldbg-check:[...]$8 = 999
+// lldbg-check:[...] 999
 // lldbr-check:(i32) x = 999
 // lldb-command:print y
-// lldbg-check:[...]$9 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:print x
-// lldbg-check:[...]$10 = 999
+// lldbg-check:[...] 999
 // lldbr-check:(i32) x = 999
 // lldb-command:print y
-// lldbg-check:[...]$11 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:print x
-// lldbg-check:[...]$12 = 1004
+// lldbg-check:[...] 1004
 // lldbr-check:(i32) x = 1004
 // lldb-command:print y
-// lldbg-check:[...]$13 = 1005
+// lldbg-check:[...] 1005
 // lldbr-check:(i32) y = 1005
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:print x
-// lldbg-check:[...]$14 = 999
+// lldbg-check:[...] 999
 // lldbr-check:(i32) x = 999
 // lldb-command:print y
-// lldbg-check:[...]$15 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) y = -1
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-in-match.rs b/tests/debuginfo/lexical-scope-in-match.rs
index 8a9ecfad249..0959f020ca3 100644
--- a/tests/debuginfo/lexical-scope-in-match.rs
+++ b/tests/debuginfo/lexical-scope-in-match.rs
@@ -64,72 +64,72 @@
 // lldb-command:run
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$0 = 231
+// lldbg-check:[...] 231
 // lldbr-check:(i32) shadowed = 231
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$1 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$2 = 233
+// lldbg-check:[...] 233
 // lldbr-check:(i32) shadowed = 233
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$3 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:print local_to_arm
-// lldbg-check:[...]$4 = 234
+// lldbg-check:[...] 234
 // lldbr-check:(i32) local_to_arm = 234
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$5 = 236
+// lldbg-check:[...] 236
 // lldbr-check:(i32) shadowed = 236
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$6 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$7 = 237
+// lldbg-check:[...] 237
 // lldbr-check:(isize) shadowed = 237
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$8 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:print local_to_arm
-// lldbg-check:[...]$9 = 238
+// lldbg-check:[...] 238
 // lldbr-check:(isize) local_to_arm = 238
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$10 = 239
+// lldbg-check:[...] 239
 // lldbr-check:(isize) shadowed = 239
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$11 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$12 = 241
+// lldbg-check:[...] 241
 // lldbr-check:(isize) shadowed = 241
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$13 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$14 = 243
+// lldbg-check:[...] 243
 // lldbr-check:(i32) shadowed = 243
 // lldb-command:print *local_to_arm
-// lldbg-check:[...]$15 = 244
+// lldbg-check:[...] 244
 // lldbr-check:(i32) *local_to_arm = 244
 // lldb-command:continue
 
 // lldb-command:print shadowed
-// lldbg-check:[...]$16 = 231
+// lldbg-check:[...] 231
 // lldbr-check:(i32) shadowed = 231
 // lldb-command:print not_shadowed
-// lldbg-check:[...]$17 = 232
+// lldbg-check:[...] 232
 // lldbr-check:(i32) not_shadowed = 232
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-in-stack-closure.rs b/tests/debuginfo/lexical-scope-in-stack-closure.rs
index eeafed9f4db..4d26b2f5c9a 100644
--- a/tests/debuginfo/lexical-scope-in-stack-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-stack-closure.rs
@@ -36,32 +36,32 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 1000
+// lldbg-check:[...] 1000
 // lldbr-check:(isize) x = 1000
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f64) x = 2.5
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) x = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
index ec998975bc7..cf908b1a510 100644
--- a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
@@ -68,69 +68,69 @@
 
 // FIRST ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$0 = 0
+// lldbg-check:[...] 0
 // lldbr-check:(i32) x = 0
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = -987
+// lldbg-check:[...] -987
 // lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$7 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$8 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$9 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$10 = -987
+// lldbg-check:[...] -987
 // lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$11 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$12 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i32) x = 2
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-in-unique-closure.rs b/tests/debuginfo/lexical-scope-in-unique-closure.rs
index 9376d039187..df8c2598e38 100644
--- a/tests/debuginfo/lexical-scope-in-unique-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-unique-closure.rs
@@ -36,32 +36,32 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 1000
+// lldbg-check:[...] 1000
 // lldbr-check:(isize) x = 1000
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f64) x = 2.5
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) x = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = false
+// 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 f70ef9c2dd1..98c580e479c 100644
--- a/tests/debuginfo/lexical-scope-in-while.rs
+++ b/tests/debuginfo/lexical-scope-in-while.rs
@@ -68,69 +68,69 @@
 
 // FIRST ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$0 = 0
+// lldbg-check:[...] 0
 // lldbr-check:(i32) x = 0
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = -987
+// lldbg-check:[...] -987
 // lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = 101
+// lldbg-check:[...] 101
 // lldbr-check:(i32) x = 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:print x
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(i32) x = 1
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$7 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i32) x = 2
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$8 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$9 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$10 = -987
+// lldbg-check:[...] -987
 // lldbr-check:(i32) x = -987
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$11 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) x = 102
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$12 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(i32) x = 2
 // lldb-command:continue
 
diff --git a/tests/debuginfo/lexical-scope-with-macro.rs b/tests/debuginfo/lexical-scope-with-macro.rs
index 400dde6af31..a38aba8b16a 100644
--- a/tests/debuginfo/lexical-scope-with-macro.rs
+++ b/tests/debuginfo/lexical-scope-with-macro.rs
@@ -57,56 +57,56 @@
 // lldb-command:run
 
 // lldb-command:print a
-// lldbg-check:[...]$0 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) a = 10
 // lldb-command:print b
-// lldbg-check:[...]$1 = 34
+// lldbg-check:[...] 34
 // lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$2 = 890242
+// lldbg-check:[...] 890242
 // lldbr-check:(i32) a = 10
 // lldb-command:print b
-// lldbg-check:[...]$3 = 34
+// lldbg-check:[...] 34
 // lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$4 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) a = 10
 // lldb-command:print b
-// lldbg-check:[...]$5 = 34
+// lldbg-check:[...] 34
 // lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // lldb-command:print a
-// lldbg-check:[...]$6 = 102
+// lldbg-check:[...] 102
 // lldbr-check:(i32) a = 10
 // lldb-command:print b
-// lldbg-check:[...]$7 = 34
+// lldbg-check:[...] 34
 // lldbr-check:(i32) b = 34
 // lldb-command:continue
 
 // Don't test this with rust-enabled lldb for now; see issue #48807
 // lldbg-command:print a
-// lldbg-check:[...]$8 = 110
+// lldbg-check:[...] 110
 // lldbg-command:print b
-// lldbg-check:[...]$9 = 34
+// lldbg-check:[...] 34
 // lldbg-command:continue
 
 // lldbg-command:print a
-// lldbg-check:[...]$10 = 10
+// lldbg-check:[...] 10
 // lldbg-command:print b
-// lldbg-check:[...]$11 = 34
+// lldbg-check:[...] 34
 // lldbg-command:continue
 
 // lldbg-command:print a
-// lldbg-check:[...]$12 = 10
+// lldbg-check:[...] 10
 // lldbg-command:print b
-// lldbg-check:[...]$13 = 34
+// lldbg-check:[...] 34
 // lldbg-command:print c
-// lldbg-check:[...]$14 = 400
+// lldbg-check:[...] 400
 // lldbg-command:continue
 
 
diff --git a/tests/debuginfo/lexical-scopes-in-block-expression.rs b/tests/debuginfo/lexical-scopes-in-block-expression.rs
index 09cb8142474..5a82dc6e3f3 100644
--- a/tests/debuginfo/lexical-scopes-in-block-expression.rs
+++ b/tests/debuginfo/lexical-scopes-in-block-expression.rs
@@ -195,202 +195,202 @@
 
 // STRUCT EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$0 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$1 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$2 = 11
+// lldbg-check:[...] 11
 // lldbr-check:(isize) val = 11
 // lldb-command:print ten
-// lldbg-check:[...]$3 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$4 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$5 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // FUNCTION CALL
 // lldb-command:print val
-// lldbg-check:[...]$6 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$7 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$8 = 12
+// lldbg-check:[...] 12
 // lldbr-check:(isize) val = 12
 // lldb-command:print ten
-// lldbg-check:[...]$9 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$10 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$11 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // TUPLE EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$12 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$13 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$14 = 13
+// lldbg-check:[...] 13
 // lldbr-check:(isize) val = 13
 // lldb-command:print ten
-// lldbg-check:[...]$15 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$16 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$17 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // VEC EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$18 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$19 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$20 = 14
+// lldbg-check:[...] 14
 // lldbr-check:(isize) val = 14
 // lldb-command:print ten
-// lldbg-check:[...]$21 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$22 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$23 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // REPEAT VEC EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$24 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$25 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$26 = 15
+// lldbg-check:[...] 15
 // lldbr-check:(isize) val = 15
 // lldb-command:print ten
-// lldbg-check:[...]$27 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$28 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$29 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // ASSIGNMENT EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$30 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$31 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$32 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(isize) val = 16
 // lldb-command:print ten
-// lldbg-check:[...]$33 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$34 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$35 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 
 // ARITHMETIC EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$36 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$37 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$38 = 17
+// lldbg-check:[...] 17
 // lldbr-check:(isize) val = 17
 // lldb-command:print ten
-// lldbg-check:[...]$39 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$40 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$41 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // INDEX EXPRESSION
 // lldb-command:print val
-// lldbg-check:[...]$42 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$43 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$44 = 18
+// lldbg-check:[...] 18
 // lldbr-check:(isize) val = 18
 // lldb-command:print ten
-// lldbg-check:[...]$45 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
 // lldb-command:print val
-// lldbg-check:[...]$46 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(i32) val = -1
 // lldb-command:print ten
-// lldbg-check:[...]$47 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(isize) ten = 10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/macro-stepping.rs b/tests/debuginfo/macro-stepping.rs
index 69cabd92298..71ff9798079 100644
--- a/tests/debuginfo/macro-stepping.rs
+++ b/tests/debuginfo/macro-stepping.rs
@@ -56,36 +56,36 @@ extern crate macro_stepping; // exports new_scope!()
 // lldb-command:run
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc1[...]
+// lldb-check:[...] #loc1 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc2[...]
+// lldb-check:[...] #loc2 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc3[...]
+// lldb-check:[...] #loc3 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc4[...]
+// lldb-check:[...] #loc4 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#loc5[...]
+// lldb-check:[...] #loc5 [...]
 
 // lldb-command:continue
 // lldb-command:step
 // lldb-command:frame select
-// lldb-check:[...]#inc-loc1[...]
+// lldb-check:[...] #inc-loc1 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#inc-loc2[...]
+// lldb-check:[...] #inc-loc2 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#inc-loc1[...]
+// lldb-check:[...] #inc-loc1 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#inc-loc2[...]
+// lldb-check:[...] #inc-loc2 [...]
 // lldb-command:next
 // lldb-command:frame select
-// lldb-check:[...]#inc-loc3[...]
+// lldb-check:[...] #inc-loc3 [...]
 
 macro_rules! foo {
     () => {
diff --git a/tests/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs
index 454967c6cb7..f947ba350e7 100644
--- a/tests/debuginfo/method-on-enum.rs
+++ b/tests/debuginfo/method-on-enum.rs
@@ -64,47 +64,47 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldb-check:[...]$0 = Variant2(117901063)
+// lldb-check:[...] Variant2(117901063)
 // lldb-command:print arg1
-// lldb-check:[...]$1 = -1
+// lldb-check:[...] -1
 // lldb-command:print arg2
-// lldb-check:[...]$2 = -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldb-check:[...]$3 = Variant2(117901063)
+// lldb-check:[...] Variant2(117901063)
 // lldb-command:print arg1
-// lldb-check:[...]$4 = -3
+// lldb-check:[...] -3
 // lldb-command:print arg2
-// lldb-check:[...]$5 = -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldb-check:[...]$6 = Variant1 { x: 1799, y: 1799 }
+// lldb-check:[...] Variant1 { x: 1799, y: 1799 }
 // lldb-command:print arg1
-// lldb-check:[...]$7 = -5
+// lldb-check:[...] -5
 // lldb-command:print arg2
-// lldb-check:[...]$8 = -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldb-check:[...]$9 = Variant1 { x: 1799, y: 1799 }
+// lldb-check:[...] Variant1 { x: 1799, y: 1799 }
 // lldb-command:print arg1
-// lldb-check:[...]$10 = -7
+// lldb-check:[...] -7
 // lldb-command:print arg2
-// lldb-check:[...]$11 = -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldb-check:[...]$12 = Variant1 { x: 1799, y: 1799 }
+// lldb-check:[...] Variant1 { x: 1799, y: 1799 }
 // lldb-command:print arg1
-// lldb-check:[...]$13 = -9
+// lldb-check:[...] -9
 // lldb-command:print arg2
-// lldb-check:[...]$14 = -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index 562798c27da..16793fb9bc6 100644
--- a/tests/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
@@ -65,61 +65,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = Struct<(u32, i32)> { x: (8888, -8888) }
+// lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
 // lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { = 8888 = -8888 } }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = Struct<(u32, i32)> { x: (8888, -8888) }
+// lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
 // lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) self = { x = { = 8888 = -8888 } }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = Struct<f64> { x: 1234.5 }
+// lldbg-check:[...] Struct<f64> { x: 1234.5 }
 // lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = Struct<f64> { x: 1234.5 }
+// lldbg-check:[...] Struct<f64> { x: 1234.5 }
 // lldbr-check:(method_on_generic_struct::Struct<f64>) self = Struct<f64> { x: 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = Struct<f64> { x: 1234.5 }
+// lldbg-check:[...] Struct<f64> { x: 1234.5 }
 // lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10
+// lldbg-check:[...] -10
 // lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/method-on-struct.rs b/tests/debuginfo/method-on-struct.rs
index bb94ced305d..56bcb462cb3 100644
--- a/tests/debuginfo/method-on-struct.rs
+++ b/tests/debuginfo/method-on-struct.rs
@@ -63,61 +63,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(method_on_struct::Struct) self = Struct { x: 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_struct::Struct) self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10
+// lldbg-check:[...] -10
 // lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/method-on-trait.rs b/tests/debuginfo/method-on-trait.rs
index bc8def40105..0264ff68d1b 100644
--- a/tests/debuginfo/method-on-trait.rs
+++ b/tests/debuginfo/method-on-trait.rs
@@ -63,61 +63,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(method_on_trait::Struct) *self = { x = 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(method_on_trait::Struct) self = { x = 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_trait::Struct) *self = { x = 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_trait::Struct) self = { x = 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(method_on_trait::Struct) *self = { x = 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10
+// lldbg-check:[...] -10
 // lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/method-on-tuple-struct.rs b/tests/debuginfo/method-on-tuple-struct.rs
index 7ac0a2d8574..872f6ea57c2 100644
--- a/tests/debuginfo/method-on-tuple-struct.rs
+++ b/tests/debuginfo/method-on-tuple-struct.rs
@@ -63,61 +63,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { 0 = 100 1 = -100.5 }
+// lldbg-check:[...] { 0 = 100 1 = -100.5 }
 // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 100 1 = -100.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { 0 = 100 1 = -100.5 }
+// lldbg-check:[...] { 0 = 100 1 = -100.5 }
 // lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 100 1 = -100.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { 0 = 200 1 = -200.5 }
+// lldbg-check:[...] { 0 = 200 1 = -200.5 }
 // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { 0 = 200 1 = -200.5 }
+// lldbg-check:[...] { 0 = 200 1 = -200.5 }
 // lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 200 1 = -200.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { 0 = 200 1 = -200.5 }
+// lldbg-check:[...] { 0 = 200 1 = -200.5 }
 // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10
+// lldbg-check:[...] -10
 // lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/multi-cgu.rs b/tests/debuginfo/multi-cgu.rs
index b2ad1d3cd95..42aa25c1421 100644
--- a/tests/debuginfo/multi-cgu.rs
+++ b/tests/debuginfo/multi-cgu.rs
@@ -24,12 +24,12 @@
 // lldb-command:run
 
 // lldb-command:print xxx
-// lldbg-check:[...]$0 = 12345
+// lldbg-check:[...] 12345
 // lldbr-check:(u32) xxx = 12345
 // lldb-command:continue
 
 // lldb-command:print yyy
-// lldbg-check:[...]$1 = 67890
+// 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 08446997b42..113eac29256 100644
--- a/tests/debuginfo/multiple-functions-equal-var-names.rs
+++ b/tests/debuginfo/multiple-functions-equal-var-names.rs
@@ -23,17 +23,17 @@
 // lldb-command:run
 
 // lldb-command:print abc
-// lldbg-check:[...]$0 = 10101
+// lldbg-check:[...] 10101
 // lldbr-check:(i32) abc = 10101
 // lldb-command:continue
 
 // lldb-command:print abc
-// lldbg-check:[...]$1 = 20202
+// lldbg-check:[...] 20202
 // lldbr-check:(i32) abc = 20202
 // lldb-command:continue
 
 // lldb-command:print abc
-// lldbg-check:[...]$2 = 30303
+// lldbg-check:[...] 30303
 // lldbr-check:(i32) abc = 30303
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/multiple-functions.rs b/tests/debuginfo/multiple-functions.rs
index 2c4092fd5a3..81fdc4f3d40 100644
--- a/tests/debuginfo/multiple-functions.rs
+++ b/tests/debuginfo/multiple-functions.rs
@@ -23,17 +23,17 @@
 // lldb-command:run
 
 // lldb-command:print a
-// lldbg-check:[...]$0 = 10101
+// lldbg-check:[...] 10101
 // lldbr-check:(i32) a = 10101
 // lldb-command:continue
 
 // lldb-command:print b
-// lldbg-check:[...]$1 = 20202
+// lldbg-check:[...] 20202
 // lldbr-check:(i32) b = 20202
 // lldb-command:continue
 
 // lldb-command:print c
-// lldbg-check:[...]$2 = 30303
+// lldbg-check:[...] 30303
 // lldbr-check:(i32) c = 30303
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/name-shadowing-and-scope-nesting.rs b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
index e8860b2d104..42df9666810 100644
--- a/tests/debuginfo/name-shadowing-and-scope-nesting.rs
+++ b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
@@ -48,50 +48,50 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:print y
-// lldbg-check:[...]$1 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:print y
-// lldbg-check:[...]$3 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:print y
-// lldbg-check:[...]$5 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$6 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) x = true
 // lldb-command:print y
-// lldbg-check:[...]$7 = 2220
+// lldbg-check:[...] 2220
 // lldbr-check:(i32) y = 2220
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$8 = 203203.5
+// lldbg-check:[...] 203203.5
 // lldbr-check:(f64) x = 203203.5
 // lldb-command:print y
-// lldbg-check:[...]$9 = 2220
+// lldbg-check:[...] 2220
 // lldbr-check:(i32) y = 2220
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$10 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:print y
-// lldbg-check:[...]$11 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) y = 20
 // lldb-command:continue
 
diff --git a/tests/debuginfo/no_mangle-info.rs b/tests/debuginfo/no_mangle-info.rs
index 15629d217ba..9cb42656f2a 100644
--- a/tests/debuginfo/no_mangle-info.rs
+++ b/tests/debuginfo/no_mangle-info.rs
@@ -11,9 +11,9 @@
 // === LLDB TESTS ==================================================================================
 // lldb-command:run
 // lldb-command:p TEST
-// lldb-check: (unsigned long) $0 = 3735928559
+// lldb-check: (unsigned long) 3735928559
 // lldb-command:p OTHER_TEST
-// lldb-check: (unsigned long) $1 = 42
+// lldb-check: (unsigned long) 42
 
 // === CDB TESTS ==================================================================================
 // cdb-command: g
diff --git a/tests/debuginfo/numeric-types.rs b/tests/debuginfo/numeric-types.rs
index f662fa7ed54..615f365173f 100644
--- a/tests/debuginfo/numeric-types.rs
+++ b/tests/debuginfo/numeric-types.rs
@@ -203,42 +203,40 @@
 // lldb-command:run
 
 // lldb-command:print/d nz_i8
-// lldb-check:[...]$0 = 11 { __0 = { 0 = 11 } }
+// lldb-check:[...] 11 { __0 = { 0 = 11 } }
 
 // lldb-command:print nz_i16
-// lldb-check:[...]$1 = 22 { __0 = { 0 = 22 } }
+// lldb-check:[...] 22 { __0 = { 0 = 22 } }
 
 // lldb-command:print nz_i32
-// lldb-check:[...]$2 = 33 { __0 = { 0 = 33 } }
+// lldb-check:[...] 33 { __0 = { 0 = 33 } }
 
 // lldb-command:print nz_i64
-// lldb-check:[...]$3 = 44 { __0 = { 0 = 44 } }
+// lldb-check:[...] 44 { __0 = { 0 = 44 } }
 
 // lldb-command:print nz_i128
-// lldb-check:[...]$4 = 55 { __0 = { 0 = 55 } }
+// lldb-check:[...] 55 { __0 = { 0 = 55 } }
 
 // lldb-command:print nz_isize
-// FIXME: `lldb_lookup.summary_lookup` is never called for `NonZero<isize>` for some reason.
-// // lldb-check:[...]$5 = 66 { __0 = { 0 = 66 } }
+// lldb-check:[...] 66 { __0 = { 0 = 66 } }
 
 // lldb-command:print/d nz_u8
-// lldb-check:[...]$6 = 77 { __0 = { 0 = 77 } }
+// lldb-check:[...] 77 { __0 = { 0 = 77 } }
 
 // lldb-command:print nz_u16
-// lldb-check:[...]$7 = 88 { __0 = { 0 = 88 } }
+// lldb-check:[...] 88 { __0 = { 0 = 88 } }
 
 // lldb-command:print nz_u32
-// lldb-check:[...]$8 = 99 { __0 = { 0 = 99 } }
+// lldb-check:[...] 99 { __0 = { 0 = 99 } }
 
 // lldb-command:print nz_u64
-// lldb-check:[...]$9 = 100 { __0 = { 0 = 100 } }
+// lldb-check:[...] 100 { __0 = { 0 = 100 } }
 
 // lldb-command:print nz_u128
-// lldb-check:[...]$10 = 111 { __0 = { 0 = 111 } }
+// lldb-check:[...] 111 { __0 = { 0 = 111 } }
 
 // lldb-command:print nz_usize
-// FIXME: `lldb_lookup.summary_lookup` is never called for `NonZero<usize>` for some reason.
-// // lldb-check:[...]$11 = 122 { __0 = { 0 = 122 } }
+// lldb-check:[...] 122 { __0 = { 0 = 122 } }
 #![feature(generic_nonzero)]
 
 use std::num::*;
diff --git a/tests/debuginfo/option-like-enum.rs b/tests/debuginfo/option-like-enum.rs
index b2a8aa1c29a..03646c99f64 100644
--- a/tests/debuginfo/option-like-enum.rs
+++ b/tests/debuginfo/option-like-enum.rs
@@ -48,34 +48,34 @@
 // lldb-command:run
 
 // lldb-command:print some
-// lldb-check:[...]$0 = Some(&0x12345678)
+// lldb-check:[...] Some(&0x12345678)
 
 // lldb-command:print none
-// lldb-check:[...]$1 = None
+// lldb-check:[...] None
 
 // lldb-command:print full
-// lldb-check:[...]$2 = Full(454545, &0x87654321, 9988)
+// lldb-check:[...] Full(454545, &0x87654321, 9988)
 
 // lldb-command:print empty
-// lldb-check:[...]$3 = Empty
+// lldb-check:[...] Empty
 
 // lldb-command:print droid
-// lldb-check:[...]$4 = Droid { id: 675675, range: 10000001, internals: &0x43218765 }
+// lldb-check:[...] Droid { id: 675675, range: 10000001, internals: &0x43218765 }
 
 // lldb-command:print void_droid
-// lldb-check:[...]$5 = Void
+// lldb-check:[...] Void
 
 // lldb-command:print some_str
-// lldb-check:[...]$6 = Some("abc")
+// lldb-check:[...] Some("abc")
 
 // lldb-command:print none_str
-// lldb-check:[...]$7 = None
+// lldb-check:[...] None
 
 // lldb-command:print nested_non_zero_yep
-// lldb-check:[...]$8 = Yep(10.5, NestedNonZeroField { a: 10, b: 20, c: &[...] })
+// lldb-check:[...] Yep(10.5, NestedNonZeroField { a: 10, b: 20, c: &[...] })
 
 // lldb-command:print nested_non_zero_nope
-// lldb-check:[...]$9 = Nope
+// lldb-check:[...] Nope
 
 
 #![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 19788339efa..b1f237db814 100644
--- a/tests/debuginfo/packed-struct-with-destructor.rs
+++ b/tests/debuginfo/packed-struct-with-destructor.rs
@@ -45,35 +45,35 @@
 // lldb-command:run
 
 // lldb-command:print packed
-// lldbg-check:[...]$0 = { x = 123 y = 234 z = 345 }
+// lldbg-check:[...] { x = 123 y = 234 z = 345 }
 // lldbr-check:(packed_struct_with_destructor::Packed) packed = { x = 123 y = 234 z = 345 }
 
 // lldb-command:print packedInPacked
-// lldbg-check:[...]$1 = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
+// 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:print packedInUnpacked
-// lldbg-check:[...]$2 = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
+// 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:print unpackedInPacked
-// lldbg-check:[...]$3 = { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 }
+// 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:print packedInPackedWithDrop
-// lldbg-check:[...]$4 = { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } }
+// 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:print packedInUnpackedWithDrop
-// lldbg-check:[...]$5 = { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } }
+// 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:print unpackedInPackedWithDrop
-// lldbg-check:[...]$6 = { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 }
+// 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:print deeplyNested
-// lldbg-check:[...]$7 = { 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 } } }
+// 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 } } }
 
 
diff --git a/tests/debuginfo/packed-struct.rs b/tests/debuginfo/packed-struct.rs
index 0276a0ffb08..b61da041243 100644
--- a/tests/debuginfo/packed-struct.rs
+++ b/tests/debuginfo/packed-struct.rs
@@ -35,27 +35,27 @@
 // lldb-command:run
 
 // lldb-command:print packed
-// lldbg-check:[...]$0 = { x = 123 y = 234 z = 345 }
+// lldbg-check:[...] { x = 123 y = 234 z = 345 }
 // lldbr-check:(packed_struct::Packed) packed = { x = 123 y = 234 z = 345 }
 
 // lldb-command:print packedInPacked
-// lldbg-check:[...]$1 = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
+// 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:print packedInUnpacked
-// lldbg-check:[...]$2 = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
+// 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:print unpackedInPacked
-// lldbg-check:[...]$3 = { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 }
+// 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:print sizeof(packed)
-// lldbg-check:[...]$4 = 14
+// lldbg-check:[...] 14
 // lldbr-check:(usize) = 14
 
 // lldb-command:print sizeof(packedInPacked)
-// lldbg-check:[...]$5 = 40
+// lldbg-check:[...] 40
 // lldbr-check:(usize) = 40
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/pretty-slices.rs b/tests/debuginfo/pretty-slices.rs
index 4faa317d6a1..4507453a107 100644
--- a/tests/debuginfo/pretty-slices.rs
+++ b/tests/debuginfo/pretty-slices.rs
@@ -21,16 +21,16 @@
 // lldb-command: run
 
 // lldb-command: print slice
-// lldb-check: (&[i32]) $0 = size=3 { [0] = 0 [1] = 1 [2] = 2 }
+// lldb-check: (&[i32]) size=3 { [0] = 0 [1] = 1 [2] = 2 }
 
 // lldb-command: print mut_slice
-// lldb-check: (&mut [i32]) $1 = size=4 { [0] = 2 [1] = 3 [2] = 5 [3] = 7 }
+// lldb-check: (&mut [i32]) size=4 { [0] = 2 [1] = 3 [2] = 5 [3] = 7 }
 
 // lldb-command: print str_slice
-// lldb-check: (&str) $2 = "string slice" { data_ptr = [...] length = 12 }
+// lldb-check: (&str) "string slice" { data_ptr = [...] length = 12 }
 
 // lldb-command: print mut_str_slice
-// lldb-check: (&mut str) $3 = "mutable string slice" { data_ptr = [...] length = 20 }
+// lldb-check: (&mut str) "mutable string slice" { data_ptr = [...] length = 20 }
 
 fn b() {}
 
diff --git a/tests/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs
index 6e7c8dfbbe8..903a9f9a272 100644
--- a/tests/debuginfo/pretty-std-collections.rs
+++ b/tests/debuginfo/pretty-std-collections.rs
@@ -59,19 +59,19 @@
 // lldb-command:run
 
 // lldb-command:print vec_deque
-// lldbg-check:[...]$0 = size=3 { [0] = 5 [1] = 3 [2] = 7 }
+// 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:print vec_deque2
-// lldbg-check:[...]$1 = size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
+// 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:print hash_map
-// lldbg-check:[...]$2 = size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } }
+// 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:print hash_set
-// lldbg-check:[...]$3 = size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
+// 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)]
diff --git a/tests/debuginfo/pretty-std.rs b/tests/debuginfo/pretty-std.rs
index 2c2795379c9..74eba9af786 100644
--- a/tests/debuginfo/pretty-std.rs
+++ b/tests/debuginfo/pretty-std.rs
@@ -45,25 +45,25 @@
 // lldb-command: run
 
 // lldb-command: print slice
-// lldb-check:[...]$0 = &[0, 1, 2, 3]
+// lldb-check:[...] &[0, 1, 2, 3]
 
 // lldb-command: print vec
-// lldb-check:[...]$1 = vec![4, 5, 6, 7]
+// lldb-check:[...] vec![4, 5, 6, 7]
 
 // lldb-command: print str_slice
-// lldb-check:[...]$2 = "IAMA string slice!"
+// lldb-check:[...] "IAMA string slice!"
 
 // lldb-command: print string
-// lldb-check:[...]$3 = "IAMA string!"
+// lldb-check:[...] "IAMA string!"
 
 // lldb-command: print some
-// lldb-check:[...]$4 = Some(8)
+// lldb-check:[...] Some(8)
 
 // lldb-command: print none
-// lldb-check:[...]$5 = None
+// lldb-check:[...] None
 
 // lldb-command: print os_string
-// lldb-check:[...]$6 = "IAMA OS string 😃"[...]
+// lldb-check:[...] "IAMA OS string 😃"[...]
 
 // === CDB TESTS ==================================================================================
 
diff --git a/tests/debuginfo/rc_arc.rs b/tests/debuginfo/rc_arc.rs
index 3cf6635a173..e340fe85e1d 100644
--- a/tests/debuginfo/rc_arc.rs
+++ b/tests/debuginfo/rc_arc.rs
@@ -18,9 +18,9 @@
 // lldb-command:run
 
 // lldb-command:print rc
-// lldb-check:[...]$0 = strong=11, weak=1 { value = 111 }
+// lldb-check:[...] strong=11, weak=1 { value = 111 }
 // lldb-command:print arc
-// lldb-check:[...]$1 = strong=21, weak=1 { data = 222 }
+// lldb-check:[...] strong=21, weak=1 { data = 222 }
 
 // === CDB TESTS ==================================================================================
 
diff --git a/tests/debuginfo/reference-debuginfo.rs b/tests/debuginfo/reference-debuginfo.rs
index 1051cc7113c..b1a6aef50cb 100644
--- a/tests/debuginfo/reference-debuginfo.rs
+++ b/tests/debuginfo/reference-debuginfo.rs
@@ -60,11 +60,11 @@
 
 // lldb-command:run
 // lldb-command:print *bool_ref
-// lldbg-check:[...]$0 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:print *int_ref
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) *int_ref = -1
 
 // NOTE: only rust-enabled lldb supports 32bit chars
@@ -72,51 +72,51 @@
 // lldbr-check:(char) *char_ref = 'a'
 
 // lldb-command:print *i8_ref
-// lldbg-check:[...]$2 = 'D'
+// lldbg-check:[...] 'D'
 // lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:print *i16_ref
-// lldbg-check:[...]$3 = -16
+// lldbg-check:[...] -16
 // lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:print *i32_ref
-// lldbg-check:[...]$4 = -32
+// lldbg-check:[...] -32
 // lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:print *i64_ref
-// lldbg-check:[...]$5 = -64
+// lldbg-check:[...] -64
 // lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:print *uint_ref
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:print *u8_ref
-// lldbg-check:[...]$7 = 'd'
+// lldbg-check:[...] 'd'
 // lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:print *u16_ref
-// lldbg-check:[...]$8 = 16
+// lldbg-check:[...] 16
 // lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:print *u32_ref
-// lldbg-check:[...]$9 = 32
+// lldbg-check:[...] 32
 // lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:print *u64_ref
-// lldbg-check:[...]$10 = 64
+// lldbg-check:[...] 64
 // lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:print *f32_ref
-// lldbg-check:[...]$11 = 2.5
+// lldbg-check:[...] 2.5
 // lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:print *f64_ref
-// lldbg-check:[...]$12 = 3.5
+// lldbg-check:[...] 3.5
 // lldbr-check:(f64) *f64_ref = 3.5
 
 // lldb-command:print *f64_double_ref
-// lldbg-check:[...]$13 = 3.5
+// lldbg-check:[...] 3.5
 // lldbr-check:(f64) **f64_double_ref = 3.5
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/regression-bad-location-list-67992.rs b/tests/debuginfo/regression-bad-location-list-67992.rs
index c397b403026..df1e9fb26fc 100644
--- a/tests/debuginfo/regression-bad-location-list-67992.rs
+++ b/tests/debuginfo/regression-bad-location-list-67992.rs
@@ -11,7 +11,7 @@
 
 // lldb-command:run
 // lldb-command:print a
-// lldbg-check:(regression_bad_location_list_67992::Foo) $0 = [...]
+// 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 eae1d58c124..9a4ecee4bf6 100644
--- a/tests/debuginfo/self-in-default-method.rs
+++ b/tests/debuginfo/self-in-default-method.rs
@@ -63,61 +63,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = -2
+// lldbg-check:[...] -2
 // lldbr-check:(isize) arg2 = -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { x = 100 }
+// lldbg-check:[...] { x = 100 }
 // lldbr-check:(self_in_default_method::Struct) self = Struct { x: 100 }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(isize) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(isize) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(self_in_default_method::Struct) self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(isize) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { x = 200 }
+// lldbg-check:[...] { x = 200 }
 // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10
+// lldbg-check:[...] -10
 // lldbr-check:(isize) arg2 = -10
 // lldb-command:continue
 
diff --git a/tests/debuginfo/self-in-generic-default-method.rs b/tests/debuginfo/self-in-generic-default-method.rs
index 92be253e18a..a21280620b5 100644
--- a/tests/debuginfo/self-in-generic-default-method.rs
+++ b/tests/debuginfo/self-in-generic-default-method.rs
@@ -63,61 +63,61 @@
 
 // STACK BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$0 = { x = 987 }
+// lldbg-check:[...] { x = 987 }
 // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 987 }
 // lldb-command:print arg1
-// lldbg-check:[...]$1 = -1
+// lldbg-check:[...] -1
 // lldbr-check:(isize) arg1 = -1
 // lldb-command:print arg2
-// lldbg-check:[...]$2 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(u16) arg2 = 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$3 = { x = 987 }
+// lldbg-check:[...] { x = 987 }
 // lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 987 }
 // lldb-command:print arg1
-// lldbg-check:[...]$4 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$5 = -4
+// lldbg-check:[...] -4
 // lldbr-check:(i16) arg2 = -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:print *self
-// lldbg-check:[...]$6 = { x = 879 }
+// lldbg-check:[...] { x = 879 }
 // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 }
 // lldb-command:print arg1
-// lldbg-check:[...]$7 = -5
+// lldbg-check:[...] -5
 // lldbr-check:(isize) arg1 = -5
 // lldb-command:print arg2
-// lldbg-check:[...]$8 = -6
+// lldbg-check:[...] -6
 // lldbr-check:(i32) arg2 = -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:print self
-// lldbg-check:[...]$9 = { x = 879 }
+// lldbg-check:[...] { x = 879 }
 // lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 879 }
 // lldb-command:print arg1
-// lldbg-check:[...]$10 = -7
+// lldbg-check:[...] -7
 // lldbr-check:(isize) arg1 = -7
 // lldb-command:print arg2
-// lldbg-check:[...]$11 = -8
+// lldbg-check:[...] -8
 // lldbr-check:(i64) arg2 = -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:print *self
-// lldbg-check:[...]$12 = { x = 879 }
+// lldbg-check:[...] { x = 879 }
 // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 }
 // lldb-command:print arg1
-// lldbg-check:[...]$13 = -9
+// lldbg-check:[...] -9
 // lldbr-check:(isize) arg1 = -9
 // lldb-command:print arg2
-// lldbg-check:[...]$14 = -10.5
+// lldbg-check:[...] -10.5
 // lldbr-check:(f32) arg2 = -10.5
 // lldb-command:continue
 
diff --git a/tests/debuginfo/shadowed-argument.rs b/tests/debuginfo/shadowed-argument.rs
index 33f73340a83..2be8cbbdfeb 100644
--- a/tests/debuginfo/shadowed-argument.rs
+++ b/tests/debuginfo/shadowed-argument.rs
@@ -30,26 +30,26 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:print y
-// lldbg-check:[...]$1 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:print y
-// lldbg-check:[...]$3 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:print y
-// lldbg-check:[...]$5 = 20
+// 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 60c392b15cb..66cadf2913b 100644
--- a/tests/debuginfo/shadowed-variable.rs
+++ b/tests/debuginfo/shadowed-variable.rs
@@ -40,42 +40,42 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:print y
-// lldbg-check:[...]$1 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:print y
-// lldbg-check:[...]$3 = true
+// lldbg-check:[...] true
 // lldbr-check:(bool) y = true
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:print y
-// lldbg-check:[...]$5 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$6 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:print y
-// lldbg-check:[...]$7 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) y = 20
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$8 = 11.5
+// lldbg-check:[...] 11.5
 // lldbr-check:(f64) x = 11.5
 // lldb-command:print y
-// lldbg-check:[...]$9 = 20
+// lldbg-check:[...] 20
 // lldbr-check:(i32) y = 20
 // lldb-command:continue
 
diff --git a/tests/debuginfo/should-fail.rs b/tests/debuginfo/should-fail.rs
index f3a8f52e0fa..4211baeee22 100644
--- a/tests/debuginfo/should-fail.rs
+++ b/tests/debuginfo/should-fail.rs
@@ -17,7 +17,7 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldb-check:[...]$0 = 5
+// lldb-check:[...] 5
 
 // === CDB TESTS ==================================================================================
 
diff --git a/tests/debuginfo/simple-lexical-scope.rs b/tests/debuginfo/simple-lexical-scope.rs
index f4be2035d3c..dfcd701017e 100644
--- a/tests/debuginfo/simple-lexical-scope.rs
+++ b/tests/debuginfo/simple-lexical-scope.rs
@@ -40,37 +40,37 @@
 // lldb-command:run
 
 // lldb-command:print x
-// lldbg-check:[...]$0 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$1 = false
+// lldbg-check:[...] false
 // lldbr-check:(bool) x = false
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$2 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$3 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$4 = 10.5
+// lldbg-check:[...] 10.5
 // lldbr-check:(f64) x = 10.5
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$5 = 10
+// lldbg-check:[...] 10
 // lldbr-check:(i32) x = 10
 // lldb-command:continue
 
 // lldb-command:print x
-// lldbg-check:[...]$6 = false
+// 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 100763f60b6..89c0cb491bf 100644
--- a/tests/debuginfo/simple-struct.rs
+++ b/tests/debuginfo/simple-struct.rs
@@ -98,27 +98,27 @@
 // lldb-command:run
 
 // lldb-command:print no_padding16
-// lldbg-check:[...]$0 = { x = 10000 y = -10001 }
+// lldbg-check:[...] { x = 10000 y = -10001 }
 // lldbr-check:(simple_struct::NoPadding16) no_padding16 = { x = 10000 y = -10001 }
 
 // lldb-command:print no_padding32
-// lldbg-check:[...]$1 = { x = -10002 y = -10003.5 z = 10004 }
+// 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:print no_padding64
-// lldbg-check:[...]$2 = { x = -10005.5 y = 10006 z = 10007 }
+// 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:print no_padding163264
-// lldbg-check:[...]$3 = { a = -10008 b = 10009 c = 10010 d = 10011 }
+// 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:print internal_padding
-// lldbg-check:[...]$4 = { x = 10012 y = -10013 }
+// lldbg-check:[...] { x = 10012 y = -10013 }
 // lldbr-check:(simple_struct::InternalPadding) internal_padding = { x = 10012 y = -10013 }
 
 // lldb-command:print padding_at_end
-// lldbg-check:[...]$5 = { x = -10014 y = 10015 }
+// lldbg-check:[...] { x = -10014 y = 10015 }
 // lldbr-check:(simple_struct::PaddingAtEnd) padding_at_end = { x = -10014 y = 10015 }
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs
index 2d8905a77bf..93f56d117ad 100644
--- a/tests/debuginfo/simple-tuple.rs
+++ b/tests/debuginfo/simple-tuple.rs
@@ -100,27 +100,27 @@
 // lldb-command:run
 
 // lldb-command:print/d noPadding8
-// lldbg-check:[...]$0 = { 0 = -100 1 = 100 }
+// lldbg-check:[...] { 0 = -100 1 = 100 }
 // lldbr-check:((i8, u8)) noPadding8 = { 0 = -100 1 = 100 }
 // lldb-command:print noPadding16
-// lldbg-check:[...]$1 = { 0 = 0 1 = 1 2 = 2 }
+// lldbg-check:[...] { 0 = 0 1 = 1 2 = 2 }
 // lldbr-check:((i16, i16, u16)) noPadding16 = { 0 = 0 1 = 1 2 = 2 }
 // lldb-command:print noPadding32
-// lldbg-check:[...]$2 = { 0 = 3 1 = 4.5 2 = 5 }
+// lldbg-check:[...] { 0 = 3 1 = 4.5 2 = 5 }
 // lldbr-check:((i32, f32, u32)) noPadding32 = { 0 = 3 1 = 4.5 2 = 5 }
 // lldb-command:print noPadding64
-// lldbg-check:[...]$3 = { 0 = 6 1 = 7.5 2 = 8 }
+// lldbg-check:[...] { 0 = 6 1 = 7.5 2 = 8 }
 // lldbr-check:((i64, f64, u64)) noPadding64 = { 0 = 6 1 = 7.5 2 = 8 }
 
 // lldb-command:print internalPadding1
-// lldbg-check:[...]$4 = { 0 = 9 1 = 10 }
+// lldbg-check:[...] { 0 = 9 1 = 10 }
 // lldbr-check:((i16, i32)) internalPadding1 = { 0 = 9 1 = 10 }
 // lldb-command:print internalPadding2
-// lldbg-check:[...]$5 = { 0 = 11 1 = 12 2 = 13 3 = 14 }
+// 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:print paddingAtEnd
-// lldbg-check:[...]$6 = { 0 = 15 1 = 16 }
+// lldbg-check:[...] { 0 = 15 1 = 16 }
 // lldbr-check:((i32, i16)) paddingAtEnd = { 0 = 15 1 = 16 }
 
 
diff --git a/tests/debuginfo/static-method-on-struct-and-enum.rs b/tests/debuginfo/static-method-on-struct-and-enum.rs
index ad078122dde..23384e0c33a 100644
--- a/tests/debuginfo/static-method-on-struct-and-enum.rs
+++ b/tests/debuginfo/static-method-on-struct-and-enum.rs
@@ -29,22 +29,22 @@
 
 // STRUCT
 // lldb-command:print arg1
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) arg1 = 1
 // lldb-command:print arg2
-// lldbg-check:[...]$1 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) arg2 = 2
 // lldb-command:continue
 
 // ENUM
 // lldb-command:print arg1
-// lldbg-check:[...]$2 = -3
+// lldbg-check:[...] -3
 // lldbr-check:(isize) arg1 = -3
 // lldb-command:print arg2
-// lldbg-check:[...]$3 = 4.5
+// lldbg-check:[...] 4.5
 // lldbr-check:(f64) arg2 = 4.5
 // lldb-command:print arg3
-// lldbg-check:[...]$4 = 5
+// lldbg-check:[...] 5
 // lldbr-check:(usize) arg3 = 5
 // lldb-command:continue
 
diff --git a/tests/debuginfo/struct-in-enum.rs b/tests/debuginfo/struct-in-enum.rs
index c340f71a6cc..a91f24a3f5c 100644
--- a/tests/debuginfo/struct-in-enum.rs
+++ b/tests/debuginfo/struct-in-enum.rs
@@ -27,12 +27,12 @@
 // lldb-command:run
 
 // lldb-command:print case1
-// lldb-check:[...]$0 = Case1(0, Struct { x: 2088533116, y: 2088533116, z: 31868 })
+// lldb-check:[...] Case1(0, Struct { x: 2088533116, y: 2088533116, z: 31868 })
 // lldb-command:print case2
-// lldb-check:[...]$1 = Case2(0, 1229782938247303441, 4369)
+// lldb-check:[...] Case2(0, 1229782938247303441, 4369)
 
 // lldb-command:print univariant
-// lldb-check:[...]$2 = TheOnlyCase(Struct { x: 123, y: 456, z: 789 })
+// lldb-check:[...] TheOnlyCase(Struct { x: 123, y: 456, z: 789 })
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-in-struct.rs b/tests/debuginfo/struct-in-struct.rs
index 287564a36cd..e88d955b6e9 100644
--- a/tests/debuginfo/struct-in-struct.rs
+++ b/tests/debuginfo/struct-in-struct.rs
@@ -24,35 +24,35 @@
 // lldb-command:run
 
 // lldb-command:print three_simple_structs
-// lldbg-check:[...]$0 = { x = { x = 1 } y = { x = 2 } z = { x = 3 } }
+// 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:print internal_padding_parent
-// lldbg-check:[...]$1 = { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } }
+// 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:print padding_at_end_parent
-// lldbg-check:[...]$2 = { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } }
+// 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:print mixed
-// lldbg-check:[...]$3 = { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 }
+// 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:print bag
-// lldbg-check:[...]$4 = { x = { x = 22 } }
+// lldbg-check:[...] { x = { x = 22 } }
 // lldbr-check:(struct_in_struct::Bag) bag = { x = { x = 22 } }
 
 // lldb-command:print bag_in_bag
-// lldbg-check:[...]$5 = { x = { x = { x = 23 } } }
+// lldbg-check:[...] { x = { x = { x = 23 } } }
 // lldbr-check:(struct_in_struct::BagInBag) bag_in_bag = { x = { x = { x = 23 } } }
 
 // lldb-command:print tjo
-// lldbg-check:[...]$6 = { x = { x = { x = { x = 24 } } } }
+// lldbg-check:[...] { x = { x = { x = { x = 24 } } } }
 // lldbr-check:(struct_in_struct::ThatsJustOverkill) tjo = { x = { x = { x = { x = 24 } } } }
 
 // lldb-command:print tree
-// lldbg-check:[...]$7 = { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } }
+// 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)]
diff --git a/tests/debuginfo/struct-namespace.rs b/tests/debuginfo/struct-namespace.rs
index f9262a458d5..d641a788a6f 100644
--- a/tests/debuginfo/struct-namespace.rs
+++ b/tests/debuginfo/struct-namespace.rs
@@ -6,17 +6,17 @@
 
 // lldb-command:run
 // lldb-command:p struct1
-// lldbg-check:(struct_namespace::Struct1) $0 = [...]
+// lldbg-check:(struct_namespace::Struct1)[...]
 // lldbr-check:(struct_namespace::Struct1) struct1 = Struct1 { a: 0, b: 1 }
 // lldb-command:p struct2
-// lldbg-check:(struct_namespace::Struct2) $1 = [...]
+// lldbg-check:(struct_namespace::Struct2)[...]
 // lldbr-check:(struct_namespace::Struct2) struct2 = { = 2 }
 
 // lldb-command:p mod1_struct1
-// lldbg-check:(struct_namespace::mod1::Struct1) $2 = [...]
+// lldbg-check:(struct_namespace::mod1::Struct1)[...]
 // lldbr-check:(struct_namespace::mod1::Struct1) mod1_struct1 = Struct1 { a: 3, b: 4 }
 // lldb-command:p mod1_struct2
-// lldbg-check:(struct_namespace::mod1::Struct2) $3 = [...]
+// lldbg-check:(struct_namespace::mod1::Struct2)[...]
 // lldbr-check:(struct_namespace::mod1::Struct2) mod1_struct2 = { = 5 }
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/struct-with-destructor.rs b/tests/debuginfo/struct-with-destructor.rs
index 9b81136e7a8..d6686be662c 100644
--- a/tests/debuginfo/struct-with-destructor.rs
+++ b/tests/debuginfo/struct-with-destructor.rs
@@ -26,19 +26,19 @@
 
 // lldb-command:run
 // lldb-command:print simple
-// lldbg-check:[...]$0 = { x = 10 y = 20 }
+// lldbg-check:[...] { x = 10 y = 20 }
 // lldbr-check:(struct_with_destructor::WithDestructor) simple = { x = 10 y = 20 }
 
 // lldb-command:print noDestructor
-// lldbg-check:[...]$1 = { a = { x = 10 y = 20 } guard = -1 }
+// 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:print withDestructor
-// lldbg-check:[...]$2 = { a = { x = 10 y = 20 } guard = -1 }
+// 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:print nested
-// lldbg-check:[...]$3 = { a = { a = { x = 7890 y = 9870 } } }
+// lldbg-check:[...] { a = { a = { x = 7890 y = 9870 } } }
 // lldbr-check:(struct_with_destructor::NestedOuter) nested = { a = { a = { x = 7890 y = 9870 } } }
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs
index c1cfe64a52e..b6b20cea9b6 100644
--- a/tests/debuginfo/tuple-in-tuple.rs
+++ b/tests/debuginfo/tuple-in-tuple.rs
@@ -36,27 +36,27 @@
 // lldb-command:run
 
 // lldb-command:print no_padding1
-// lldbg-check:[...]$0 = { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
+// 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:print no_padding2
-// lldbg-check:[...]$1 = { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 }
+// 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:print no_padding3
-// lldbg-check:[...]$2 = { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } }
+// 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:print internal_padding1
-// lldbg-check:[...]$3 = { 0 = 12 1 = { 0 = 13 1 = 14 } }
+// 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:print internal_padding2
-// lldbg-check:[...]$4 = { 0 = 15 1 = { 0 = 16 1 = 17 } }
+// 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:print padding_at_end1
-// lldbg-check:[...]$5 = { 0 = 18 1 = { 0 = 19 1 = 20 } }
+// 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:print padding_at_end2
-// lldbg-check:[...]$6 = { 0 = { 0 = 21 1 = 22 } 1 = 23 }
+// lldbg-check:[...] { 0 = { 0 = 21 1 = 22 } 1 = 23 }
 // lldbr-check:(((i32, i16), i32)) padding_at_end2 = { 0 = { 0 = 21 1 = 22 } 1 = 23 }
 
 
diff --git a/tests/debuginfo/tuple-struct.rs b/tests/debuginfo/tuple-struct.rs
index 5eeb1a6eed4..e912f63a8b2 100644
--- a/tests/debuginfo/tuple-struct.rs
+++ b/tests/debuginfo/tuple-struct.rs
@@ -36,27 +36,27 @@
 // lldb-command:run
 
 // lldb-command:print no_padding16
-// lldbg-check:[...]$0 = { 0 = 10000 1 = -10001 }
+// lldbg-check:[...] { 0 = 10000 1 = -10001 }
 // lldbr-check:(tuple_struct::NoPadding16) no_padding16 = { 0 = 10000 1 = -10001 }
 
 // lldb-command:print no_padding32
-// lldbg-check:[...]$1 = { 0 = -10002 1 = -10003.5 2 = 10004 }
+// 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:print no_padding64
-// lldbg-check:[...]$2 = { 0 = -10005.5 1 = 10006 2 = 10007 }
+// 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:print no_padding163264
-// lldbg-check:[...]$3 = { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 }
+// 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:print internal_padding
-// lldbg-check:[...]$4 = { 0 = 10012 1 = -10013 }
+// lldbg-check:[...] { 0 = 10012 1 = -10013 }
 // lldbr-check:(tuple_struct::InternalPadding) internal_padding = { 0 = 10012 1 = -10013 }
 
 // lldb-command:print padding_at_end
-// lldbg-check:[...]$5 = { 0 = -10014 1 = 10015 }
+// 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
diff --git a/tests/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs
index aa57ebdc844..8df4c9dbf96 100644
--- a/tests/debuginfo/union-smoke.rs
+++ b/tests/debuginfo/union-smoke.rs
@@ -19,13 +19,13 @@
 
 // lldb-command:run
 // lldb-command:print u
-// lldbg-check:[...]$0 = { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
+// lldbg-check:[...] { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
 // lldbr-check:(union_smoke::U) u = { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
 
 // Don't test this with rust-enabled lldb for now; see
 // https://github.com/rust-lang-nursery/lldb/issues/18
 // lldbg-command:print union_smoke::SU
-// lldbg-check:[...]$1 = { a = { 0 = '\x01' 1 = '\x01' } b = 257 }
+// lldbg-check:[...] { a = { 0 = '\x01' 1 = '\x01' } b = 257 }
 
 #![allow(unused)]
 #![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 75ab245e13e..62cb87e4f99 100644
--- a/tests/debuginfo/var-captured-in-nested-closure.rs
+++ b/tests/debuginfo/var-captured-in-nested-closure.rs
@@ -44,42 +44,42 @@
 // lldb-command:run
 
 // lldb-command:print variable
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) variable = 1
 // lldb-command:print constant
-// lldbg-check:[...]$1 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) constant = 2
 // lldb-command:print a_struct
-// lldbg-check:[...]$2 = { a = -3 b = 4.5 c = 5 }
+// 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:print *struct_ref
-// lldbg-check:[...]$3 = { a = -3 b = 4.5 c = 5 }
+// 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:print *owned
-// lldbg-check:[...]$4 = 6
+// lldbg-check:[...] 6
 // lldbr-check:(isize) *owned = 6
 // lldb-command:print closure_local
-// lldbg-check:[...]$5 = 8
+// lldbg-check:[...] 8
 // lldbr-check:(isize) closure_local = 8
 // lldb-command:continue
 
 // lldb-command:print variable
-// lldbg-check:[...]$6 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) variable = 1
 // lldb-command:print constant
-// lldbg-check:[...]$7 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) constant = 2
 // lldb-command:print a_struct
-// lldbg-check:[...]$8 = { a = -3 b = 4.5 c = 5 }
+// 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:print *struct_ref
-// lldbg-check:[...]$9 = { a = -3 b = 4.5 c = 5 }
+// 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:print *owned
-// lldbg-check:[...]$10 = 6
+// lldbg-check:[...] 6
 // lldbr-check:(isize) *owned = 6
 // lldb-command:print closure_local
-// lldbg-check:[...]$11 = 8
+// 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 b7992deef44..e2e154e91cb 100644
--- a/tests/debuginfo/var-captured-in-sendable-closure.rs
+++ b/tests/debuginfo/var-captured-in-sendable-closure.rs
@@ -24,13 +24,13 @@
 // lldb-command:run
 
 // lldb-command:print constant
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) constant = 1
 // lldb-command:print a_struct
-// lldbg-check:[...]$1 = { a = -2 b = 3.5 c = 4 }
+// 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:print *owned
-// lldbg-check:[...]$2 = 5
+// lldbg-check:[...] 5
 // lldbr-check:(isize) *owned = 5
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/var-captured-in-stack-closure.rs b/tests/debuginfo/var-captured-in-stack-closure.rs
index eb68b081a6d..c704b53ef85 100644
--- a/tests/debuginfo/var-captured-in-stack-closure.rs
+++ b/tests/debuginfo/var-captured-in-stack-closure.rs
@@ -40,37 +40,37 @@
 // lldb-command:run
 
 // lldb-command:print variable
-// lldbg-check:[...]$0 = 1
+// lldbg-check:[...] 1
 // lldbr-check:(isize) variable = 1
 // lldb-command:print constant
-// lldbg-check:[...]$1 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) constant = 2
 // lldb-command:print a_struct
-// lldbg-check:[...]$2 = { a = -3 b = 4.5 c = 5 }
+// 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:print *struct_ref
-// lldbg-check:[...]$3 = { a = -3 b = 4.5 c = 5 }
+// 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:print *owned
-// lldbg-check:[...]$4 = 6
+// lldbg-check:[...] 6
 // lldbr-check:(isize) *owned = 6
 
 // lldb-command:continue
 
 // lldb-command:print variable
-// lldbg-check:[...]$5 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) variable = 2
 // lldb-command:print constant
-// lldbg-check:[...]$6 = 2
+// lldbg-check:[...] 2
 // lldbr-check:(isize) constant = 2
 // lldb-command:print a_struct
-// lldbg-check:[...]$7 = { a = -3 b = 4.5 c = 5 }
+// 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:print *struct_ref
-// lldbg-check:[...]$8 = { a = -3 b = 4.5 c = 5 }
+// 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:print *owned
-// lldbg-check:[...]$9 = 6
+// lldbg-check:[...] 6
 // lldbr-check:(isize) *owned = 6
 
 
diff --git a/tests/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs
index b044110fc78..bf3cad30faf 100644
--- a/tests/debuginfo/vec-slices.rs
+++ b/tests/debuginfo/vec-slices.rs
@@ -71,27 +71,27 @@
 // lldb-command:run
 
 // lldb-command:print empty
-// lldbg-check:[...]$0 = size=0
+// lldbg-check:[...] size=0
 // lldbr-check:(&[i64]) empty = size=0
 
 // lldb-command:print singleton
-// lldbg-check:[...]$1 = size=1 { [0] = 1 }
+// lldbg-check:[...] size=1 { [0] = 1 }
 // lldbr-check:(&[i64]) singleton = &[1]
 
 // lldb-command:print multiple
-// lldbg-check:[...]$2 = size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 }
+// 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:print slice_of_slice
-// lldbg-check:[...]$3 = size=2 { [0] = 3 [1] = 4 }
+// lldbg-check:[...] size=2 { [0] = 3 [1] = 4 }
 // lldbr-check:(&[i64]) slice_of_slice = size=2 { [0] = 3 [1] = 4 }
 
 // lldb-command:print padded_tuple
-// lldbg-check:[...]$4 = size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } }
+// 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:print padded_struct
-// lldbg-check:[...]$5 = size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }
+// 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)]
diff --git a/tests/debuginfo/vec.rs b/tests/debuginfo/vec.rs
index 27d04094e3c..0ac2f2acb59 100644
--- a/tests/debuginfo/vec.rs
+++ b/tests/debuginfo/vec.rs
@@ -18,7 +18,7 @@
 
 // lldb-command:run
 // lldb-command:print a
-// lldbg-check:[...]$0 = { [0] = 1 [1] = 2 [2] = 3 }
+// lldbg-check:[...] { [0] = 1 [1] = 2 [2] = 3 }
 // lldbr-check:([i32; 3]) a = { [0] = 1 [1] = 2 [2] = 3 }
 
 #![allow(unused_variables)]