Skip to content

Commit cca7eb7

Browse files
committed
[embedded] Relax test expectations in test/embedded/ to prepare for -mergeable-symbols as default
1 parent 27bec4b commit cca7eb7

5 files changed

+14
-14
lines changed

test/embedded/concurrency-deleted-method.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ actor MyActor {
3131
}
3232

3333
// CHECK-IR: @swift_deletedAsyncMethodErrorTu =
34-
// CHECK-IR: @"$e4main7MyActorCN" = global <{ ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{
34+
// CHECK-IR: @"$e4main7MyActorCN" = {{.*}}global <{ ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{
3535
// CHECK-IR-SAME: ptr null,
3636
// CHECK-IR-SAME: ptr @"$e4main7MyActorCfD",
3737
// CHECK-IR-SAME: ptr null,
@@ -45,6 +45,6 @@ actor MyActor {
4545

4646
// CHECK-IR-NOT: $e4main7MyActorC12thisIsUnusedyyYaF
4747

48-
// CHECK-IR: define swifttailcc void @swift_deletedAsyncMethodError(ptr swiftasync %0)
48+
// CHECK-IR: define {{.*}}swifttailcc void @swift_deletedAsyncMethodError(ptr swiftasync %0)
4949

5050
// CHECK: value: 42

test/embedded/ptrauth-none-macho.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public func foo() {
1616
callback3?(true, true)
1717
}
1818

19-
// CHECK-LABEL: define swiftcc void @"$e4main3fooyyF"()
19+
// CHECK-LABEL: define {{.*}}swiftcc void @"$e4main3fooyyF"()
2020

2121
// CHECK: [[P1:%.*]] = load ptr, ptr @"$e4main8callbackyycSgvp"
2222
// CHECK: call swiftcc void [[P1:%.*]](ptr swiftself {{.*}}) [ "ptrauth"(i32 0, i64 3848) ]

test/embedded/static-object.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// CHECK-DAG: @"$e4test10storeArrayyyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
1717
// CHECK-DAG: @"$e4test3StrV9staticLet_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
1818
// CHECK-DAG: @"$e4test3StrV9staticVar_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
19-
// CHECK-DAG: @"$e4test3StrV9staticVarSaySiGvpZ" = global {{.*}} ptr @"$e4test3StrV9staticVar_WZTv_r"
20-
// CHECK-DAG: @"$e4test3StrV14twoDimensionalSaySaySiGGvpZ" = global {{.*}} ptr @"$e4test3StrV14twoDimensional_WZTv{{[0-9]*}}_r"
19+
// CHECK-DAG: @"$e4test3StrV9staticVarSaySiGvpZ" = {{.*}}global {{.*}} ptr @"$e4test3StrV9staticVar_WZTv_r"
20+
// CHECK-DAG: @"$e4test3StrV14twoDimensionalSaySaySiGGvpZ" = {{.*}}global {{.*}} ptr @"$e4test3StrV14twoDimensional_WZTv{{[0-9]*}}_r"
2121

2222
// Currently, constant static arrays only work on Darwin platforms.
2323
// REQUIRES: VENDOR=apple

test/embedded/traps-fatalerror-ir.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: %target-swift-emit-ir -enable-experimental-feature Embedded -wmo %s | %FileCheck %s --check-prefix=CHECK-MESSAGE
2-
// RUN: %target-swift-emit-ir -enable-experimental-feature Embedded -wmo %s -O | %FileCheck %s --check-prefix=CHECK-NOMESSAGE
3-
// RUN: %target-swift-emit-ir -enable-experimental-feature Embedded -wmo %s -Osize | %FileCheck %s --check-prefix=CHECK-NOMESSAGE
4-
// RUN: %target-swift-emit-ir -enable-experimental-feature Embedded -wmo %s -O -assert-config Debug | %FileCheck %s --check-prefix=CHECK-MESSAGE
5-
// RUN: %target-swift-emit-ir -enable-experimental-feature Embedded -wmo %s -Osize -assert-config Debug | %FileCheck %s --check-prefix=CHECK-MESSAGE
1+
// RUN: %target-swift-emit-ir -disable-llvm-merge-functions-pass -enable-experimental-feature Embedded -wmo %s | %FileCheck %s --check-prefix=CHECK-MESSAGE
2+
// RUN: %target-swift-emit-ir -disable-llvm-merge-functions-pass -enable-experimental-feature Embedded -wmo %s -O | %FileCheck %s --check-prefix=CHECK-NOMESSAGE
3+
// RUN: %target-swift-emit-ir -disable-llvm-merge-functions-pass -enable-experimental-feature Embedded -wmo %s -Osize | %FileCheck %s --check-prefix=CHECK-NOMESSAGE
4+
// RUN: %target-swift-emit-ir -disable-llvm-merge-functions-pass -enable-experimental-feature Embedded -wmo %s -O -assert-config Debug | %FileCheck %s --check-prefix=CHECK-MESSAGE
5+
// RUN: %target-swift-emit-ir -disable-llvm-merge-functions-pass -enable-experimental-feature Embedded -wmo %s -Osize -assert-config Debug | %FileCheck %s --check-prefix=CHECK-MESSAGE
66

77
// REQUIRES: swift_in_compiler
88
// REQUIRES: optimized_stdlib

test/embedded/traps-multiple-preconditions-ir.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ public func test(i: Int) {
3636

3737
// "Production builds" - We expect 4 separate trap blocks in the IR.
3838
// CHECK-NOMESSAGE: define {{.*}}void @"$e4main4test1iySi_tF"(i64 %0) {{.*}}{
39-
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 0) #3
39+
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 0)
4040
// CHECK-NOMESSAGE: tail call void @llvm.trap()
4141
// CHECK-NOMESSAGE: unreachable
42-
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 1) #3
42+
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 1)
4343
// CHECK-NOMESSAGE: tail call void @llvm.trap()
4444
// CHECK-NOMESSAGE: unreachable
45-
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 2) #3
45+
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 2)
4646
// CHECK-NOMESSAGE: tail call void @llvm.trap()
4747
// CHECK-NOMESSAGE: unreachable
48-
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 3) #3
48+
// CHECK-NOMESSAGE: tail call void asm sideeffect "", "n"(i32 3)
4949
// CHECK-NOMESSAGE: tail call void @llvm.trap()
5050
// CHECK-NOMESSAGE: unreachable
5151
// CHECK-NOMESSAGE: }

0 commit comments

Comments
 (0)