Skip to content

Commit 3e2b018

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 3e2b018

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/macOS/x86_64/stdlib.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,4 @@ Added: __swift_pod_copy
244244
Added: __swift_pod_destroy
245245
Added: __swift_pod_direct_initializeBufferWithCopyOfBuffer
246246
Added: __swift_pod_indirect_initializeBufferWithCopyOfBuffer
247+
Added: _swift_exceptionPersonality

0 commit comments

Comments
 (0)