ObjCExport: don't use autorelease when sending arguments to Swift/Obj-C
This commit is contained in:
Svyatoslav Scherbina
committed by
Space
Space
parent
9326978327
commit
085e2448cd
@@ -1020,11 +1020,18 @@ __attribute__((swift_name("NoAutoreleaseSendHelper")))
|
||||
@protocol KtNoAutoreleaseSendHelper
|
||||
@required
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@end;
|
||||
|
||||
__attribute__((swift_name("NoAutoreleaseReceiveHelper")))
|
||||
@@ -1043,11 +1050,18 @@ __attribute__((swift_name("NoAutoreleaseKotlinSendHelper")))
|
||||
@interface KtNoAutoreleaseKotlinSendHelper : KtBase <KtNoAutoreleaseSendHelper>
|
||||
- (instancetype)initWithKotlinLivenessTracker:(KtKotlinLivenessTracker *)kotlinLivenessTracker __attribute__((swift_name("init(kotlinLivenessTracker:)"))) __attribute__((objc_designated_initializer));
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@property (readonly) KtKotlinLivenessTracker *kotlinLivenessTracker __attribute__((swift_name("kotlinLivenessTracker")));
|
||||
@end;
|
||||
|
||||
@@ -1091,11 +1105,13 @@ __attribute__((swift_name("NoAutoreleaseKt")))
|
||||
@interface KtNoAutoreleaseKt : KtBase
|
||||
+ (void)gc __attribute__((swift_name("gc()")));
|
||||
+ (void)callSendKotlinObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendKotlinObject(helper:tracker:)")));
|
||||
+ (void)sendKotlinObjectToBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("sendKotlinObjectToBlock(helper:tracker:)")));
|
||||
+ (void)callSendSwiftObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker swiftObject:(id)swiftObject __attribute__((swift_name("callSendSwiftObject(helper:tracker:swiftObject:)")));
|
||||
+ (void)callSendListHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendList(helper:tracker:)")));
|
||||
+ (void)callSendStringHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendString(helper:tracker:)")));
|
||||
+ (void)callSendNumberHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendNumber(helper:tracker:)")));
|
||||
+ (void)callSendBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendBlock(helper:tracker:)")));
|
||||
+ (void)callSendCompletionHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendCompletion(helper:tracker:)")));
|
||||
+ (void)callReceiveKotlinObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveKotlinObject(helper:tracker:)")));
|
||||
+ (void)callReceiveSwiftObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveSwiftObject(helper:tracker:)")));
|
||||
+ (void)callReceiveListHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveList(helper:tracker:)")));
|
||||
|
||||
@@ -962,11 +962,18 @@ __attribute__((swift_name("NoAutoreleaseSendHelper")))
|
||||
@protocol KtNoAutoreleaseSendHelper
|
||||
@required
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@end;
|
||||
|
||||
__attribute__((swift_name("NoAutoreleaseReceiveHelper")))
|
||||
@@ -985,11 +992,18 @@ __attribute__((swift_name("NoAutoreleaseKotlinSendHelper")))
|
||||
@interface KtNoAutoreleaseKotlinSendHelper : KtBase <KtNoAutoreleaseSendHelper>
|
||||
- (instancetype)initWithKotlinLivenessTracker:(KtKotlinLivenessTracker *)kotlinLivenessTracker __attribute__((swift_name("init(kotlinLivenessTracker:)"))) __attribute__((objc_designated_initializer));
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@property (readonly) KtKotlinLivenessTracker *kotlinLivenessTracker __attribute__((swift_name("kotlinLivenessTracker")));
|
||||
@end;
|
||||
|
||||
@@ -1033,11 +1047,13 @@ __attribute__((swift_name("NoAutoreleaseKt")))
|
||||
@interface KtNoAutoreleaseKt : KtBase
|
||||
+ (void)gc __attribute__((swift_name("gc()")));
|
||||
+ (void)callSendKotlinObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendKotlinObject(helper:tracker:)")));
|
||||
+ (void)sendKotlinObjectToBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("sendKotlinObjectToBlock(helper:tracker:)")));
|
||||
+ (void)callSendSwiftObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker swiftObject:(id)swiftObject __attribute__((swift_name("callSendSwiftObject(helper:tracker:swiftObject:)")));
|
||||
+ (void)callSendListHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendList(helper:tracker:)")));
|
||||
+ (void)callSendStringHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendString(helper:tracker:)")));
|
||||
+ (void)callSendNumberHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendNumber(helper:tracker:)")));
|
||||
+ (void)callSendBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendBlock(helper:tracker:)")));
|
||||
+ (void)callSendCompletionHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendCompletion(helper:tracker:)")));
|
||||
+ (void)callReceiveKotlinObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveKotlinObject(helper:tracker:)")));
|
||||
+ (void)callReceiveSwiftObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveSwiftObject(helper:tracker:)")));
|
||||
+ (void)callReceiveListHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveList(helper:tracker:)")));
|
||||
|
||||
@@ -962,11 +962,18 @@ __attribute__((swift_name("NoAutoreleaseSendHelper")))
|
||||
@protocol KtNoAutoreleaseSendHelper
|
||||
@required
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@end;
|
||||
|
||||
__attribute__((swift_name("NoAutoreleaseReceiveHelper")))
|
||||
@@ -985,11 +992,18 @@ __attribute__((swift_name("NoAutoreleaseKotlinSendHelper")))
|
||||
@interface KtNoAutoreleaseKotlinSendHelper : KtBase <KtNoAutoreleaseSendHelper>
|
||||
- (instancetype)initWithKotlinLivenessTracker:(KtKotlinLivenessTracker *)kotlinLivenessTracker __attribute__((swift_name("init(kotlinLivenessTracker:)"))) __attribute__((objc_designated_initializer));
|
||||
- (void)sendKotlinObjectKotlinObject:(KtKotlinObject *)kotlinObject __attribute__((swift_name("sendKotlinObject(kotlinObject:)")));
|
||||
- (void (^)(KtKotlinObject *))blockReceivingKotlinObject __attribute__((swift_name("blockReceivingKotlinObject()")));
|
||||
- (void)sendSwiftObjectSwiftObject:(id)swiftObject __attribute__((swift_name("sendSwiftObject(swiftObject:)")));
|
||||
- (void)sendListList:(NSArray<id> *)list __attribute__((swift_name("sendList(list:)")));
|
||||
- (void)sendStringString:(NSString *)string __attribute__((swift_name("sendString(string:)")));
|
||||
- (void)sendNumberNumber:(id)number __attribute__((swift_name("sendNumber(number:)")));
|
||||
- (void)sendBlockBlock:(KtKotlinObject *(^)(void))block __attribute__((swift_name("sendBlock(block:)")));
|
||||
|
||||
/**
|
||||
@note This method converts instances of CancellationException to errors.
|
||||
Other uncaught Kotlin exceptions are fatal.
|
||||
*/
|
||||
- (void)sendCompletionWithCompletionHandler:(void (^)(id _Nullable_result, NSError * _Nullable))completionHandler __attribute__((swift_name("sendCompletion(completionHandler:)")));
|
||||
@property (readonly) KtKotlinLivenessTracker *kotlinLivenessTracker __attribute__((swift_name("kotlinLivenessTracker")));
|
||||
@end;
|
||||
|
||||
@@ -1033,11 +1047,13 @@ __attribute__((swift_name("NoAutoreleaseKt")))
|
||||
@interface KtNoAutoreleaseKt : KtBase
|
||||
+ (void)gc __attribute__((swift_name("gc()")));
|
||||
+ (void)callSendKotlinObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendKotlinObject(helper:tracker:)")));
|
||||
+ (void)sendKotlinObjectToBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("sendKotlinObjectToBlock(helper:tracker:)")));
|
||||
+ (void)callSendSwiftObjectHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker swiftObject:(id)swiftObject __attribute__((swift_name("callSendSwiftObject(helper:tracker:swiftObject:)")));
|
||||
+ (void)callSendListHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendList(helper:tracker:)")));
|
||||
+ (void)callSendStringHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendString(helper:tracker:)")));
|
||||
+ (void)callSendNumberHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendNumber(helper:tracker:)")));
|
||||
+ (void)callSendBlockHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendBlock(helper:tracker:)")));
|
||||
+ (void)callSendCompletionHelper:(id<KtNoAutoreleaseSendHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callSendCompletion(helper:tracker:)")));
|
||||
+ (void)callReceiveKotlinObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveKotlinObject(helper:tracker:)")));
|
||||
+ (void)callReceiveSwiftObjectHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveSwiftObject(helper:tracker:)")));
|
||||
+ (void)callReceiveListHelper:(id<KtNoAutoreleaseReceiveHelper>)helper tracker:(KtKotlinLivenessTracker *)tracker __attribute__((swift_name("callReceiveList(helper:tracker:)")));
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package noAutorelease
|
||||
|
||||
import kotlin.coroutines.*
|
||||
import kotlin.coroutines.intrinsics.*
|
||||
import kotlin.native.internal.NativePtr
|
||||
import kotlin.native.ref.WeakReference
|
||||
import kotlin.test.*
|
||||
@@ -23,11 +25,13 @@ class KotlinObject
|
||||
|
||||
interface NoAutoreleaseSendHelper {
|
||||
fun sendKotlinObject(kotlinObject: KotlinObject)
|
||||
fun blockReceivingKotlinObject(): (KotlinObject) -> Unit
|
||||
fun sendSwiftObject(swiftObject: Any)
|
||||
fun sendList(list: List<*>)
|
||||
fun sendString(string: String)
|
||||
fun sendNumber(number: Any)
|
||||
fun sendBlock(block: () -> KotlinObject)
|
||||
suspend fun sendCompletion(): Any?
|
||||
}
|
||||
|
||||
interface NoAutoreleaseReceiveHelper {
|
||||
@@ -41,11 +45,16 @@ interface NoAutoreleaseReceiveHelper {
|
||||
|
||||
class NoAutoreleaseKotlinSendHelper(val kotlinLivenessTracker: KotlinLivenessTracker) : NoAutoreleaseSendHelper {
|
||||
override fun sendKotlinObject(kotlinObject: KotlinObject) = kotlinLivenessTracker.add(kotlinObject)
|
||||
override fun blockReceivingKotlinObject(): (KotlinObject) -> Unit = { kotlinLivenessTracker.add(it) }
|
||||
override fun sendSwiftObject(swiftObject: Any) = kotlinLivenessTracker.add(swiftObject)
|
||||
override fun sendList(list: List<*>) = kotlinLivenessTracker.add(list)
|
||||
override fun sendString(string: String) = kotlinLivenessTracker.add(string)
|
||||
override fun sendNumber(number: Any) = kotlinLivenessTracker.add(number)
|
||||
override fun sendBlock(block: () -> KotlinObject) = kotlinLivenessTracker.add(block)
|
||||
override suspend fun sendCompletion() = suspendCoroutineUninterceptedOrReturn<Any?> { continuation ->
|
||||
kotlinLivenessTracker.add(continuation)
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
class NoAutoreleaseKotlinReceiveHelper(val kotlinLivenessTracker: KotlinLivenessTracker) : NoAutoreleaseReceiveHelper {
|
||||
@@ -82,6 +91,14 @@ fun callSendKotlinObject(helper: NoAutoreleaseSendHelper, tracker: KotlinLivenes
|
||||
tracker.add(kotlinObject)
|
||||
}
|
||||
|
||||
fun sendKotlinObjectToBlock(helper: NoAutoreleaseSendHelper, tracker: KotlinLivenessTracker) {
|
||||
val kotlinObject = KotlinObject()
|
||||
|
||||
helper.blockReceivingKotlinObject()(kotlinObject)
|
||||
helper.blockReceivingKotlinObject()(kotlinObject)
|
||||
tracker.add(kotlinObject)
|
||||
}
|
||||
|
||||
fun callSendSwiftObject(helper: NoAutoreleaseSendHelper, tracker: KotlinLivenessTracker, swiftObject: Any) {
|
||||
helper.sendSwiftObject(swiftObject)
|
||||
helper.sendSwiftObject(swiftObject)
|
||||
@@ -120,6 +137,22 @@ fun callSendBlock(helper: NoAutoreleaseSendHelper, tracker: KotlinLivenessTracke
|
||||
tracker.add(block)
|
||||
}
|
||||
|
||||
private class EmptyContinuation : Continuation<Any?> {
|
||||
override val context: CoroutineContext = EmptyCoroutineContext
|
||||
override fun resumeWith(result: Result<Any?>) { result.getOrThrow() }
|
||||
}
|
||||
|
||||
fun callSendCompletion(helper: NoAutoreleaseSendHelper, tracker: KotlinLivenessTracker) {
|
||||
val completion = EmptyContinuation()
|
||||
|
||||
suspend {
|
||||
helper.sendCompletion()
|
||||
helper.sendCompletion()
|
||||
}.startCoroutine(completion)
|
||||
|
||||
tracker.add(completion)
|
||||
}
|
||||
|
||||
fun callReceiveKotlinObject(helper: NoAutoreleaseReceiveHelper, tracker: KotlinLivenessTracker) = repeat(2) {
|
||||
tracker.add(helper.receiveKotlinObject())
|
||||
}
|
||||
|
||||
@@ -40,6 +40,12 @@ private class NoAutoreleaseSwiftHelper : NoAutoreleaseSendHelper, NoAutoreleaseR
|
||||
swiftLivenessTracker.add(kotlinObject)
|
||||
}
|
||||
|
||||
func blockReceivingKotlinObject() -> (KotlinObject) -> Void {
|
||||
return {
|
||||
self.swiftLivenessTracker.add($0)
|
||||
}
|
||||
}
|
||||
|
||||
func sendSwiftObject(swiftObject: Any) {
|
||||
swiftLivenessTracker.add(swiftObject as AnyObject)
|
||||
}
|
||||
@@ -57,6 +63,10 @@ private class NoAutoreleaseSwiftHelper : NoAutoreleaseSendHelper, NoAutoreleaseR
|
||||
func sendBlock(block: @escaping () -> KotlinObject) {
|
||||
}
|
||||
|
||||
func sendCompletion(completionHandler: @escaping (Any?, Error?) -> Void) {
|
||||
completionHandler(nil, nil)
|
||||
}
|
||||
|
||||
let kotlinObject = KotlinObject()
|
||||
let swiftObject = SwiftObject2()
|
||||
let list = createList()
|
||||
@@ -220,6 +230,12 @@ private func testSendKotlinObjectToKotlin() throws {
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendKotlinObjectToKotlinBlock() throws {
|
||||
try testSendToKotlin({ KotlinObject() }) {
|
||||
$0.blockReceivingKotlinObject()($1)
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendSwiftObjectToKotlin() throws {
|
||||
try testSendToKotlin({ SwiftObject1() }) {
|
||||
$0.sendSwiftObject(swiftObject: $1)
|
||||
@@ -250,6 +266,12 @@ private func testSendBlockToKotlin() throws {
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendCompletionToKotlin() throws {
|
||||
try testSendToKotlin({ createCompletion() }, flags: TestFlags(trackSwiftLifetime: false)) {
|
||||
$0.sendCompletion(completionHandler: $1)
|
||||
}
|
||||
}
|
||||
|
||||
private func testReceiveKotlinObjectFromKotlin() throws {
|
||||
try testReceiveFromKotlin {
|
||||
$0.receiveKotlinObject()
|
||||
@@ -328,6 +350,15 @@ private func testSendKotlinObjectToSwift() throws {
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendKotlinObjectToSwiftBlock() throws {
|
||||
// Getting Swift block in Kotlin still adds it to the autoreleasepool.
|
||||
// The block is not our target, so just use `checkAutorelease: false` flag
|
||||
// to disable the relevant check for now.
|
||||
try testCallToSwift(flags: TestFlags(checkAutorelease: false)) {
|
||||
NoAutoreleaseKt.sendKotlinObjectToBlock(helper: $0, tracker: $1)
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendSwiftObjectToSwift() throws {
|
||||
try testCallToSwift {
|
||||
NoAutoreleaseKt.callSendSwiftObject(helper: $0, tracker: $1, swiftObject: SwiftObject4())
|
||||
@@ -361,6 +392,12 @@ private func testSendBlockToSwift() throws {
|
||||
}
|
||||
}
|
||||
|
||||
private func testSendCompletionToSwift() throws {
|
||||
try testCallToSwift(flags: TestFlags(trackSwiftLifetime: false)) {
|
||||
NoAutoreleaseKt.callSendCompletion(helper: $0, tracker: $1)
|
||||
}
|
||||
}
|
||||
|
||||
private func testReceiveKotlinObjectFromSwift() throws {
|
||||
try testCallToSwift(flags: TestFlags(runGCTwice: true)) {
|
||||
NoAutoreleaseKt.callReceiveKotlinObject(helper: $0, tracker: $1)
|
||||
@@ -421,6 +458,10 @@ private func createBlock(swiftLivenessTracker: SwiftLivenessTracker) -> () -> Ko
|
||||
}
|
||||
}
|
||||
|
||||
private func createCompletion() -> (Any?, Error?) -> Void {
|
||||
return { _, _ in }
|
||||
}
|
||||
|
||||
private func createString() -> String {
|
||||
return NSObject().description // Make it dynamic.
|
||||
}
|
||||
@@ -434,11 +475,13 @@ class NoAutoreleaseTests : SimpleTestProvider {
|
||||
super.init()
|
||||
|
||||
test("testSendKotlinObjectToKotlin", testSendKotlinObjectToKotlin)
|
||||
test("testSendKotlinObjectToKotlinBlock", testSendKotlinObjectToKotlinBlock)
|
||||
test("testSendSwiftObjectToKotlin", testSendSwiftObjectToKotlin)
|
||||
test("testSendListToKotlin", testSendListToKotlin)
|
||||
test("testSendStringToKotlin", testSendStringToKotlin)
|
||||
test("testSendNumberToKotlin", testSendNumberToKotlin)
|
||||
test("testSendBlockToKotlin", testSendBlockToKotlin)
|
||||
test("testSendCompletionToKotlin", testSendCompletionToKotlin)
|
||||
|
||||
test("testReceiveKotlinObjectFromKotlin", testReceiveKotlinObjectFromKotlin)
|
||||
test("testReceiveSwiftObjectFromKotlin", testReceiveSwiftObjectFromKotlin)
|
||||
@@ -454,18 +497,16 @@ class NoAutoreleaseTests : SimpleTestProvider {
|
||||
test("testGetKotlinSingleton", testGetKotlinSingleton)
|
||||
test("testGetKotlinEnumEntry", testGetKotlinEnumEntry)
|
||||
|
||||
#if false
|
||||
test("testSendKotlinObjectToSwift", testSendKotlinObjectToSwift)
|
||||
#endif
|
||||
|
||||
test("testSendKotlinObjectToSwiftBlock", testSendKotlinObjectToSwiftBlock)
|
||||
test("testSendSwiftObjectToSwift", testSendSwiftObjectToSwift)
|
||||
|
||||
#if false
|
||||
test("testSendListToSwift", testSendListToSwift)
|
||||
test("testSendStringToSwift", testSendStringToSwift)
|
||||
test("testSendNumberToSwift", testSendNumberToSwift)
|
||||
test("testSendBlockToSwift", testSendBlockToSwift)
|
||||
test("testSendCompletionToSwift", testSendCompletionToSwift)
|
||||
|
||||
#if false
|
||||
test("testReceiveKotlinObjectFromSwift", testReceiveKotlinObjectFromSwift)
|
||||
test("testReceiveSwiftObjectFromSwift", testReceiveSwiftObjectFromSwift)
|
||||
test("testReceiveListFromSwift", testReceiveListFromSwift)
|
||||
|
||||
Reference in New Issue
Block a user