Skip to content

Commit 24a2031

Browse files
committed
[Test] Fix tests to account for the new personality function.
The exception handling tests should check for the new personality, and the ABI check needs to know about the new entry point in the runtime. rdar://120952971
1 parent a217fc9 commit 24a2031

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

test/Interop/Cxx/exceptions/objc-trap-on-exception-irgen-itanium.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func testObjCMethodCall() {
3232

3333
testObjCMethodCall()
3434

35-
// CHECK: define {{.*}} @"$s4test0A14ObjCMethodCallyyF"() #[[#UWATTR:]] personality
35+
// CHECK: define {{.*}} @"$s4test0A14ObjCMethodCallyyF"() #[[#UWATTR:]] personality ptr @swift_exceptionPersonality
3636
// CHECK: invoke void {{.*}}@objc_msgSend
3737
// CHECK-NEXT: to label %[[CONT1:.*]] unwind label %[[UNWIND1:.*]]
3838
// CHECK-EMPTY:

test/Interop/Cxx/exceptions/trap-on-exception-irgen-itanium.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public func test() {
309309
// CHECK-NEXT: ret i32
310310
// CHECK-NEXT: }
311311

312-
// CHECK: define {{.*}} @"$s4test0A17FreeFunctionCallss5Int32VyF"() #[[#SWIFTUWMETA:]] personality ptr @__gxx_personality_v0
312+
// CHECK: define {{.*}} @"$s4test0A17FreeFunctionCallss5Int32VyF"() #[[#SWIFTUWMETA:]] personality ptr @swift_exceptionPersonality
313313
// CHECK: invoke i32 @_Z18freeFunctionThrowsi(i32 0)
314314
// CHECK-NEXT: to label %[[CONT1:.*]] unwind label %[[UNWIND1:.*]]
315315
// CHECK-EMPTY:

test/abi/Inputs/macOS/x86_64/stdlib/baseline-asserts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13602,6 +13602,7 @@ _swift_enumSimple_getEnumTag
1360213602
_swift_errorInMain
1360313603
_swift_errorRelease
1360413604
_swift_errorRetain
13605+
_swift_exceptionPersonality
1360513606
_swift_findAccessibleFunction
1360613607
_swift_float16ToString
1360713608
_swift_float32ToString

0 commit comments

Comments
 (0)