From b37d94fcfe62a88e7aaf08904f71273900202c69 Mon Sep 17 00:00:00 2001
From: Ben Kimock <kimockb@gmail.com>
Date: Sat, 10 Aug 2024 09:26:12 -0400
Subject: [PATCH] Try to fix more tests

---
 tests/debuginfo/by-value-non-immediate-argument.rs    | 6 +++---
 tests/debuginfo/function-arg-initialization.rs        | 2 +-
 tests/debuginfo/function-prologue-stepping-regular.rs | 2 +-
 tests/debuginfo/method-on-enum.rs                     | 2 +-
 tests/debuginfo/struct-in-enum.rs                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs
index 874d1ad77667..229d0d2bfbfc 100644
--- a/tests/debuginfo/by-value-non-immediate-argument.rs
+++ b/tests/debuginfo/by-value-non-immediate-argument.rs
@@ -1,6 +1,6 @@
 //@ min-lldb-version: 310
 
-//@ compile-flags:-g
+//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
 
 // === GDB TESTS ===================================================================================
 
@@ -41,11 +41,11 @@
 // lldb-command:run
 
 // lldb-command:v s
-// lldb-check:[...] Struct { a: 1, b: 2.5 }
+// lldb-check:[...] Struct { a = 1 b = 2.5 }
 // lldb-command:continue
 
 // lldb-command:v x
-// lldb-check:[...] Struct { a: 3, b: 4.5 }
+// lldb-check:[...] Struct { a = 3 b = 4.5 }
 // lldb-command:v y
 // lldb-check:[...] 5
 // lldb-command:v z
diff --git a/tests/debuginfo/function-arg-initialization.rs b/tests/debuginfo/function-arg-initialization.rs
index 87604930ed5f..2cb65eb53000 100644
--- a/tests/debuginfo/function-arg-initialization.rs
+++ b/tests/debuginfo/function-arg-initialization.rs
@@ -7,7 +7,7 @@
 // arguments have been properly loaded when setting the breakpoint via the
 // function name.
 
-//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
+//@ compile-flags:-g -Zmir-opt-level=0
 
 // === GDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/function-prologue-stepping-regular.rs b/tests/debuginfo/function-prologue-stepping-regular.rs
index 7a536ae4a63d..ebb3dff8ff9e 100644
--- a/tests/debuginfo/function-prologue-stepping-regular.rs
+++ b/tests/debuginfo/function-prologue-stepping-regular.rs
@@ -3,7 +3,7 @@
 
 //@ min-lldb-version: 310
 //@ ignore-gdb
-//@ compile-flags:-g
+//@ compile-flags:-g -Zmir-enable-passes=-SingleUseConsts
 
 // lldb-command:breakpoint set --name immediate_args
 // lldb-command:breakpoint set --name non_immediate_args
diff --git a/tests/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs
index f087564442a4..7a96844dc2ba 100644
--- a/tests/debuginfo/method-on-enum.rs
+++ b/tests/debuginfo/method-on-enum.rs
@@ -1,6 +1,6 @@
 //@ min-lldb-version: 310
 
-//@ compile-flags:-g
+//@ compile-flags:-g -Zmir-opt-level=0
 
 // === GDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/struct-in-enum.rs b/tests/debuginfo/struct-in-enum.rs
index dfcef4e0f8e2..c1d1d19347b9 100644
--- a/tests/debuginfo/struct-in-enum.rs
+++ b/tests/debuginfo/struct-in-enum.rs
@@ -1,7 +1,7 @@
 //@ min-lldb-version: 310
 //@ ignore-gdb-version: 7.11.90 - 7.12.9
 
-//@ compile-flags:-g
+//@ compile-flags:-g -Zmir-opt-level=0
 
 // === GDB TESTS ===================================================================================