Merge pull request #76390 from rastogishubham/FixupTestsCoroSplit

rastogishubham · web-flow · commit 9f3654fe87ca · 2024-09-10T15:05:36.000-07:00
Fixup swift tests for DIExpression folding in Corosplit
diff --git a/test/DebugInfo/async-args.swift b/test/DebugInfo/async-args.swift
@@ -16,8 +16,8 @@ func withGenericArg<T>(_ msg: T) async {
 
   await forceSplit()
   // CHECK-LABEL: {{^define .*}} @"$s1M14withGenericArgyyxYalFTQ0_"(ptr swiftasync %0)
-  // CHECK-DAG: #dbg_declare(ptr %0, ![[MSG_R:[0-9]+]], !DIExpression({{.*}}DW_OP_plus_uconst, [[OFFSET:[0-9]+]], DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref),
-  // CHECK-DAG: #dbg_declare(ptr %0, ![[TAU_R:[0-9]+]], !DIExpression({{.*}}DW_OP_deref, DW_OP_plus_uconst, [[OFFSET]], DW_OP_plus_uconst, {{[0-9]+}}),
+  // CHECK-DAG: #dbg_declare(ptr %0, ![[MSG_R:[0-9]+]], !DIExpression({{.*}}DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref),
+  // CHECK-DAG: #dbg_declare(ptr %0, ![[TAU_R:[0-9]+]], !DIExpression({{.*}}DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}),
   use(msg)
 }
 // CHECK-LABEL: {{^define }}
diff --git a/test/DebugInfo/async-let-await.swift b/test/DebugInfo/async-let-await.swift
@@ -13,7 +13,7 @@ public func getVegetables() async -> [String] {
 public func chopVegetables() async throws -> [String] {
   let veggies = await getVegetables()
   // CHECK-NOT: {{^define }}
-  // CHECK:  #dbg_declare(ptr %0, ![[V:[0-9]+]], !DIExpression(DW_OP_LLVM_entry_value, 1, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_plus_uconst, {{[0-9]+}})
+  // CHECK:  #dbg_declare(ptr %0, ![[V:[0-9]+]], !DIExpression(DW_OP_LLVM_entry_value, 1, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}})
   // CHECK: ![[V]] = !DILocalVariable(name: "veggies"
   return veggies.map { "chopped \($0)" }
 }
diff --git a/test/DebugInfo/move_function_dbginfo_async.swift b/test/DebugInfo/move_function_dbginfo_async.swift

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public func getVegetables() async -> [String] {`
`13`	`13`	`public func chopVegetables() async throws -> [String] {`
`14`	`14`	`let veggies = await getVegetables()`
`15`	`15`	`// CHECK-NOT: {{^define }}`
`16`		`- // CHECK: #dbg_declare(ptr %0, ![[V:[0-9]+]], !DIExpression(DW_OP_LLVM_entry_value, 1, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_plus_uconst, {{[0-9]+}})`
	`16`	`+ // CHECK: #dbg_declare(ptr %0, ![[V:[0-9]+]], !DIExpression(DW_OP_LLVM_entry_value, 1, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}})`
`17`	`17`	`// CHECK: ![[V]] = !DILocalVariable(name: "veggies"`
`18`	`18`	`return veggies.map { "chopped \($0)" }`
`19`	`19`	`}`