More fixing

Author: saethlin

Diff for: tests/debuginfo/by-value-non-immediate-argument.rs

@@ -1,5 +1,5 @@
 //@ min-lldb-version: 1800
-//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
+//@ compile-flags:-g
 
 // === GDB TESTS ===================================================================================
 

Diff for: tests/debuginfo/function-arg-initialization.rs

@@ -6,7 +6,7 @@
 // function name.
 
 //@ min-lldb-version: 1800
-//@ compile-flags:-g -Zmir-opt-level=0
+//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
 
 // === GDB TESTS ===================================================================================
 

Diff for: tests/debuginfo/function-prologue-stepping-regular.rs

@@ -3,7 +3,7 @@
 
 //@ min-lldb-version: 1800
 //@ ignore-gdb
-//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
+//@ compile-flags:-g
 
 // lldb-command:breakpoint set --name immediate_args
 // lldb-command:breakpoint set --name non_immediate_args

Diff for: tests/debuginfo/method-on-enum.rs

@@ -1,6 +1,6 @@
 //@ min-lldb-version: 1800
 
-//@ compile-flags:-g -Zmir-opt-level=0
+//@ compile-flags:-g
 
 // === GDB TESTS ===================================================================================
 

Diff for: tests/debuginfo/option-like-enum.rs

@@ -1,6 +1,6 @@
 //@ min-lldb-version: 1800
 
-//@ compile-flags:-g -Zmir-opt-level=0
+//@ compile-flags:-g
 
 // === GDB TESTS ===================================================================================
 

Diff for: tests/debuginfo/pretty-std.rs

@@ -3,7 +3,7 @@
 //@ ignore-android: FIXME(#10381)
 //@ compile-flags:-g
 //@ min-gdb-version: 7.7
-//@ min-lldb-version: 310
+//@ min-lldb-version: 1800
 //@ min-cdb-version: 10.0.18317.1001
 
 // === GDB TESTS ===================================================================================
@@ -44,16 +44,16 @@
 // lldb-command:run
 
 // lldb-command:v slice
-// lldb-check:[...] slice = &[0, 1, 2, 3]
+// lldb-check:[...] slice = size=4 { [0] = 0 [1] = 1 [2] = 2 [3] = 3 }
 
 // lldb-command:v vec
-// lldb-check:[...] vec = vec![4, 5, 6, 7]
+// lldb-check:[...] vec = size=4 { [0] = 4 [1] = 5 [2] = 6 [3] = 7 }
 
 // lldb-command:v str_slice
-// lldb-check:[...] str_slice = "IAMA string slice!"
+// lldb-check:[...] str_slice = "IAMA string slice!" { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 's' [6] = 't' [7] = 'r' [8] = 'i' [9] = 'n' [10] = 'g' [11] = ' ' [12] = 's' [13] = 'l' [14] = 'i' [15] = 'c' [16] = 'e' [17] = '!' }
 
 // lldb-command:v string
-// lldb-check:[...] string = "IAMA string!"
+// lldb-check:[...] string = "IAMA string!" { vec = size=12 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 's' [6] = 't' [7] = 'r' [8] = 'i' [9] = 'n' [10] = 'g' [11] = '!' } }
 
 // lldb-command:v some
 // lldb-check:[...] some = Some(8)
@@ -62,7 +62,7 @@
 // lldb-check:[...] none = None
 
 // lldb-command:v os_string
-// lldb-check:[...] os_string = "IAMA OS string 😃"[...]
+// lldb-check:[...] os_string = "IAMA OS string 😃" { inner = { inner = size=19 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'O' [6] = 'S' [7] = ' ' [8] = 's' [9] = 't' [10] = 'r' [11] = 'i' [12] = 'n' [13] = 'g' [14] = ' ' [15] = '\xf0' [16] = '\x9f' [17] = '\x98' [18] = '\x83' } } }
 
 // === CDB TESTS ==================================================================================
 

Diff for: tests/debuginfo/struct-in-enum.rs

@@ -1,7 +1,7 @@
 //@ min-lldb-version: 1800
 //@ ignore-gdb-version: 7.11.90 - 7.12.9
 
-//@ compile-flags:-g -Zmir-opt-level=0
+//@ compile-flags:-g
 
 // === GDB TESTS ===================================================================================