`ret` has been optimized away in debuginfo test

1 files changed, 9 insertions, 30 deletions

diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs
index 96f2aa3acf2..f5e34c39119 100644
--- a/src/test/debuginfo/generic-function.rs
+++ b/src/test/debuginfo/generic-function.rs
@@ -1,5 +1,3 @@
-// ignore-tidy-linelength
-
 // min-lldb-version: 310
 
 // compile-flags:-g
@@ -12,31 +10,21 @@
 // gdb-check:$1 = 1
 // gdb-command:print *t1
 // gdb-check:$2 = 2.5
-// gdb-command:print ret
-// gdbg-check:$3 = {__0 = {__0 = 1, __1 = 2.5}, __1 = {__0 = 2.5, __1 = 1}}
-// gdbr-check:$3 = ((1, 2.5), (2.5, 1))
 // gdb-command:continue
 
 // gdb-command:print *t0
-// gdb-check:$4 = 3.5
+// gdb-check:$3 = 3.5
 // gdb-command:print *t1
-// gdb-check:$5 = 4
-// gdb-command:print ret
-// gdbg-check:$6 = {__0 = {__0 = 3.5, __1 = 4}, __1 = {__0 = 4, __1 = 3.5}}
-// gdbr-check:$6 = ((3.5, 4), (4, 3.5))
+// gdb-check:$4 = 4
 // gdb-command:continue
 
 // gdb-command:print *t0
-// gdb-check:$7 = 5
+// gdb-check:$5 = 5
 // gdb-command:print *t1
-// gdbg-check:$8 = {a = 6, b = 7.5}
-// gdbr-check:$8 = generic_function::Struct {a: 6, b: 7.5}
-// gdb-command:print ret
-// gdbg-check:$9 = {__0 = {__0 = 5, __1 = {a = 6, b = 7.5}}, __1 = {__0 = {a = 6, b = 7.5}, __1 = 5}}
-// gdbr-check:$9 = ((5, generic_function::Struct {a: 6, b: 7.5}), (generic_function::Struct {a: 6, b: 7.5}, 5))
+// gdbg-check:$6 = {a = 6, b = 7.5}
+// gdbr-check:$6 = generic_function::Struct {a: 6, b: 7.5}
 // gdb-command:continue
 
-
 // === LLDB TESTS ==================================================================================
 
 // lldb-command:run
@@ -47,31 +35,22 @@
 // lldb-command:print *t1
 // lldbg-check:[...]$1 = 2.5
 // lldbr-check:(f64) *t1 = 2.5
-// lldb-command:print ret
-// lldbg-check:[...]$2 = ((1, 2.5), (2.5, 1))
-// lldbr-check:(((i32, f64), (f64, i32))) ret = { = { = 1 = 2.5 } = { = 2.5 = 1 } }
 // lldb-command:continue
 
 // lldb-command:print *t0
-// lldbg-check:[...]$3 = 3.5
+// lldbg-check:[...]$2 = 3.5
 // lldbr-check:(f64) *t0 = 3.5
 // lldb-command:print *t1
-// lldbg-check:[...]$4 = 4
+// lldbg-check:[...]$3 = 4
 // lldbr-check:(u16) *t1 = 4
-// lldb-command:print ret
-// lldbg-check:[...]$5 = ((3.5, 4), (4, 3.5))
-// lldbr-check:(((f64, u16), (u16, f64))) ret = { = { = 3.5 = 4 } = { = 4 = 3.5 } }
 // lldb-command:continue
 
 // lldb-command:print *t0
-// lldbg-check:[...]$6 = 5
+// lldbg-check:[...]$4 = 5
 // lldbr-check:(i32) *t0 = 5
 // lldb-command:print *t1
-// lldbg-check:[...]$7 = Struct { a: 6, b: 7.5 }
+// lldbg-check:[...]$5 = Struct { a: 6, b: 7.5 }
 // lldbr-check:(generic_function::Struct) *t1 = Struct { a: 6, b: 7.5 }
-// lldb-command:print ret
-// lldbg-check:[...]$8 = ((5, Struct { a: 6, b: 7.5 }), (Struct { a: 6, b: 7.5 }, 5))
-// lldbr-check:(((i32, generic_function::Struct), (generic_function::Struct, i32))) ret = { = { = 5 = Struct { a: 6, b: 7.5 } } = { = Struct { a: 6, b: 7.5 } = 5 } }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]