Skip to content

Commit c24447b

Browse files
Merge pull request swiftlang#86126 from aschwaighofer/embedded_ptrauth_test_fixes
[embedded] Fix some tests for ptrauth
2 parents 4e6b9f2 + 139b648 commit c24447b

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

test/embedded/concurrency-deleted-method.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ actor MyActor {
4040
// CHECK-IR: @swift_deletedAsyncMethodErrorTu =
4141
// CHECK-IR: @"$e4main7MyActorCN" = global <{ ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{
4242
// CHECK-IR-SAME: ptr null,
43-
// CHECK-IR-SAME: ptr @"$e4main7MyActorCfD",
43+
// CHECK-IR-SAME: ptr @"$e4main7MyActorCfD{{(.ptrauth[.0-9]*)?}}",
4444
// CHECK-IR-SAME: ptr null,
45-
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
46-
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
47-
// CHECK-IR-SAME: ptr @swift_deletedMethodError,
48-
// CHECK-IR-SAME: ptr @"$e4main7MyActorC3fooyyYaFTu",
49-
// CHECK-IR-SAME: ptr @got.swift_deletedAsyncMethodErrorTu,
50-
// CHECK-IR-SAME: ptr @"$e4main7MyActorCACycfC"
45+
// CHECK-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
46+
// CHECK-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
47+
// CHECK-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
48+
// CHECK-IR-SAME: ptr @"$e4main7MyActorC3fooyyYaFTu{{(.ptrauth[.0-9]*)?}}",
49+
// CHECK-IR-SAME: ptr @got.swift_deletedAsyncMethodErrorTu{{(.ptrauth[.0-9]*)?}},
50+
// CHECK-IR-SAME: ptr @"$e4main7MyActorCACycfC{{(.ptrauth[.0-9]*)?}}"
5151
// CHECK-IR-SAME: }>, align {{[48]}}
5252

5353
// CHECK-IR-NOT: $e4main7MyActorC12thisIsUnusedyyYaF
@@ -58,16 +58,16 @@ actor MyActor {
5858

5959
// EXIST-IR: @swift_deletedAsyncMethodErrorTu =
6060
// EXIST-IR: @"$e4main7MyActorCMf" = {{.*}} <{ ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{
61-
// EXIST-IR-SAME: ptr @"$eBoWV",
61+
// EXIST-IR-SAME: ptr @"$eBoWV{{(.ptrauth[.0-9]*)?}}",
6262
// EXIST-IR-SAME: ptr null,
63-
// EXIST-IR-SAME: ptr @"$e4main7MyActorCfD",
63+
// EXIST-IR-SAME: ptr @"$e4main7MyActorCfD{{(.ptrauth[.0-9]*)?}}",
6464
// EXIST-IR-SAME: ptr null,
65-
// EXIST-IR-SAME: ptr @swift_deletedMethodError,
66-
// EXIST-IR-SAME: ptr @swift_deletedMethodError,
67-
// EXIST-IR-SAME: ptr @swift_deletedMethodError,
68-
// EXIST-IR-SAME: ptr @"$e4main7MyActorC3fooyyYaFTu",
69-
// EXIST-IR-SAME: ptr @got.swift_deletedAsyncMethodErrorTu,
70-
// EXIST-IR-SAME: ptr @"$e4main7MyActorCACycfC" }>
65+
// EXIST-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
66+
// EXIST-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
67+
// EXIST-IR-SAME: ptr @swift_deletedMethodError{{(.ptrauth[.0-9]*)?}},
68+
// EXIST-IR-SAME: ptr @"$e4main7MyActorC3fooyyYaFTu{{(.ptrauth[.0-9]*)?}}",
69+
// EXIST-IR-SAME: ptr @got.swift_deletedAsyncMethodErrorTu{{(.ptrauth[.0-9]*)?}},
70+
// EXIST-IR-SAME: ptr @"$e4main7MyActorCACycfC{{(.ptrauth[.0-9]*)?}}" }>
7171

7272
// EXIST-IR-DAG: @"$e4main7MyActorCN" = {{.*}}alias{{.*}} ptr @"$e4main7MyActorCMf", i32 0, i32 1)
7373

test/embedded/managed-buffer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
// CHECK: @"$e4main8MyBufferCN" = {{.*global.*}} <{ ptr @"$es13ManagedBufferCySis5UInt8VGN", ptr @"$e4main8MyBufferCfD{{[^"]*}}", ptr null, ptr @"$e4main8MyBufferC12_doNotCallMeACyt_tcfC{{[^"]*}}" }>
88
// CHECK: @"$es13ManagedBufferCySis5UInt8VGN" = {{.*global.*}} <{ ptr null, ptr @"$es13ManagedBufferCfDSi_s5UInt8VTgq5{{[^"]*}}", ptr null, ptr @"$es13ManagedBufferC12_doNotCallMeAByxq_Gyt_tcfCSi_s5UInt8VTgq5{{[^"]*}}" }>
99

10-
// EXIST: @"$e4main8MyBufferCMf" = {{.*}} <{ ptr @"$eBoWV", {{.*}} ptr @"$es13ManagedBufferCySis5UInt8VGMf", i32 0, i32 1), ptr @"$e4main8MyBufferCfD{{[^"]*}}", ptr null, ptr @"$e4main8MyBufferC12_doNotCallMeACyt_tcfC{{[^"]*}}" }>
11-
// EXIST: @"$es13ManagedBufferCySis5UInt8VGMf" = {{.*}} <{ ptr @"$eBoWV", ptr null, ptr @"$es13ManagedBufferCfDSi_s5UInt8VTgq5{{[^"]*}}", ptr null, ptr @"$es13ManagedBufferC12_doNotCallMeAByxq_Gyt_tcfCSi_s5UInt8VTgq5{{[^"]*}}" }>
10+
// EXIST: @"$e4main8MyBufferCMf" = {{.*}} <{ ptr @"$eBoWV{{[^"]*}}", {{.*}} ptr @"$es13ManagedBufferCySis5UInt8VGMf", i32 0, i32 1), ptr @"$e4main8MyBufferCfD{{[^"]*}}", ptr null, ptr @"$e4main8MyBufferC12_doNotCallMeACyt_tcfC{{[^"]*}}" }>
11+
// EXIST: @"$es13ManagedBufferCySis5UInt8VGMf" = {{.*}} <{ ptr @"$eBoWV{{[^"]*}}", ptr null, ptr @"$es13ManagedBufferCfDSi_s5UInt8VTgq5{{[^"]*}}", ptr null, ptr @"$es13ManagedBufferC12_doNotCallMeAByxq_Gyt_tcfCSi_s5UInt8VTgq5{{[^"]*}}" }>
1212

1313
// EXIST: @"$e4main8MyBufferCN" = {{.*}}alias
1414
// EXIST: @"$es13ManagedBufferCySis5UInt8VGN" = {{.*}}alias

test/embedded/static-object.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
// Check if the optimizer is able to convert array literals to constant statically initialized arrays.
1111

12-
// CHECK-DAG: @"$e4test11arrayLookupyS2iFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
13-
// CHECK-DAG: @"$e4test11returnArraySaySiGyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
14-
// CHECK-DAG: @"$e4test9passArrayyyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
15-
// CHECK-DAG: @"$e4test9passArrayyyFTv0_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
16-
// CHECK-DAG: @"$e4test10storeArrayyyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
17-
// CHECK-DAG: @"$e4test3StrV9staticLet_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
18-
// CHECK-DAG: @"$e4test3StrV9staticVar_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN", {{.*}} -1
12+
// CHECK-DAG: @"$e4test11arrayLookupyS2iFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
13+
// CHECK-DAG: @"$e4test11returnArraySaySiGyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
14+
// CHECK-DAG: @"$e4test9passArrayyyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
15+
// CHECK-DAG: @"$e4test9passArrayyyFTv0_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
16+
// CHECK-DAG: @"$e4test10storeArrayyyFTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
17+
// CHECK-DAG: @"$e4test3StrV9staticLet_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
18+
// CHECK-DAG: @"$e4test3StrV9staticVar_WZTv_r" = {{.*}} constant {{.*}} @"$es20__StaticArrayStorageCN{{(.ptrauth[.0-9]*)?}}", {{.*}} -1
1919
// CHECK-DAG: @"$e4test3StrV9staticVarSaySiGvpZ" = global {{.*}} ptr @"$e4test3StrV9staticVar_WZTv_r"
2020
// CHECK-DAG: @"$e4test3StrV14twoDimensionalSaySaySiGGvpZ" = global {{.*}} ptr @"$e4test3StrV14twoDimensional_WZTv{{[0-9]*}}_r"
2121

0 commit comments

Comments
 (0)