Skip to content

Commit d115630

Browse files
[DebugInfo] Re-enable x86 async tests
With swiftlang/llvm-project#7787 merged, we can now finally renable these tests, as the x86 swift async handling should be properly preserved by the x86 instruction selector. These tests contained some incorrect checks from a time where it was expecting an entry value even in the entry funclet of coroutines. For example, it had this: ``` CHECK-NEXT: [[ASYNC_REG:DW_OP_.*], DW_OP_plus_uconst 0x10, DW_OP_plus_uconst 0x8, DW_OP_deref ``` Which tries to find some "async reg", but really matches anything. It worked by accident on arm, but not on x86. The correct check is simply: ``` CHECK-NOT: OP_entry_value ```
1 parent db7a400 commit d115630

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

test/DebugInfo/move_function_dbginfo.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// REQUIRES: CPU=arm64
21
// RUN: %empty-directory(%t)
32
// RUN: %target-swift-frontend -parse-as-library -g -emit-ir -o - %s | %FileCheck %s
43
// RUN: %target-swift-frontend -parse-as-library -g -c %s -o %t/out.o

test/DebugInfo/move_function_dbginfo_async.swift

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// REQUIRES: CPU=arm64
21
// RUN: %empty-directory(%t)
32
// RUN: %target-swift-frontend -parse-as-library -disable-availability-checking -g -emit-sil -o - %s | %FileCheck -check-prefix=SIL %s
43
// RUN: %target-swift-frontend -parse-as-library -disable-availability-checking -g -emit-ir -o - %s | %FileCheck %s
@@ -67,8 +66,8 @@ public func forceSplit5() async {}
6766
// DWARF1: DW_AT_linkage_name ("$s3out13letSimpleTestyyxnYalF")
6867
// DWARF1: DW_TAG_formal_parameter
6968
// DWARF1-NEXT: DW_AT_location
70-
// DWARF1-NEXT: [[ASYNC_REG:DW_OP_.*]], DW_OP_plus_uconst 0x10, DW_OP_plus_uconst 0x8, DW_OP_deref
71-
// DWARF1-NEXT: DW_AT_name ("msg")
69+
// DWARF1-NOT: OP_entry_value
70+
// DWARF1: DW_AT_name ("msg")
7271
//
7372
// RUN: %llvm-dwarfdump -c --name='$s3out13letSimpleTestyyxnYalFTQ0_' %t/out.o | %FileCheck -check-prefix=DWARF2 %s
7473
// DWARF2: DW_AT_linkage_name ("$s3out13letSimpleTestyyxnYalFTQ0_")
@@ -128,8 +127,8 @@ public func letSimpleTest<T>(_ msg: __owned T) async {
128127
// DWARF4: DW_AT_name ("varSimpleTest")
129128
// DWARF4: DW_TAG_formal_parameter
130129
// DWARF4-NEXT: DW_AT_location
131-
// DWARF4-NEXT: [[ASYNC_REG:.*]], DW_OP_plus_uconst 0x10, DW_OP_plus_uconst 0x8, DW_OP_deref, DW_OP_deref
132-
// DWARF4-NEXT: DW_AT_name ("msg")
130+
// DWARF4-NOT: OP_entry_value
131+
// DWARF4: DW_AT_name ("msg")
133132
//
134133
// RUN: %llvm-dwarfdump -c --name='$s3out13varSimpleTestyyxz_xtYalFTQ0_' %t/out.o | %FileCheck -check-prefix=DWARF5 %s
135134
// DWARF5: DW_AT_linkage_name ("$s3out13varSimpleTestyyxz_xtYalFTQ0_")
@@ -356,8 +355,8 @@ public func varSimpleTestVar() async {
356355

357356
// DWARF17: DW_TAG_formal_parameter
358357
// DWARF17-NEXT: DW_AT_location
359-
// DWARF17-NEXT: [[ASYNC_REG:.*]], DW_OP_plus_uconst 0x10, DW_OP_plus_uconst 0x8, DW_OP_deref, DW_OP_deref
360-
// DWARF17-NEXT: DW_AT_name ("msg")
358+
// DWARF17-NOT: OP_entry_value
359+
// DWARF17: DW_AT_name ("msg")
361360
//
362361
// RUN: %llvm-dwarfdump -c --name='$s3out20letArgCCFlowTrueTestyyxnYalFTQ0_' %t/out.o | %FileCheck -check-prefix=DWARF18 %s
363362
// DWARF18: DW_AT_linkage_name ("$s3out20letArgCCFlowTrueTestyyxnYalFTQ0_")
@@ -493,8 +492,8 @@ public func letArgCCFlowTrueTest<T>(_ msg: __owned T) async {
493492
// DWARF24: DW_AT_name ("varArgCCFlowTrueTest")
494493
// DWARF24: DW_TAG_formal_parameter
495494
// DWARF24-NEXT: DW_AT_location
496-
// DWARF24-NEXT: [[ASYNC_REG:.*]], DW_OP_plus_uconst 0x10, DW_OP_plus_uconst 0x30, DW_OP_deref, DW_OP_deref
497-
// DWARF24-NEXT: DW_AT_name ("msg")
495+
// DWARF24-NOT: OP_entry_value
496+
// DWARF24: DW_AT_name ("msg")
498497
//
499498

500499
// RUN: %llvm-dwarfdump -c --name='$s3out20varArgCCFlowTrueTestyyxzYaAA1PRzlFTQ0_' %t/out.o | %FileCheck -check-prefix=DWARF25 %s

0 commit comments

Comments
 (0)