azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ObjCExport: fix replacing Kotlin class methods by Swift extensions

Browse Source 
^KT-49937 Fixed
This commit is contained in:
Svyatoslav Scherbina
2022-01-26 18:23:04 +03:00
committed by Space
parent 199edd59f8
commit 4cd60090e0
6 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/main/cpp/ObjCExport.mm
+4 -4
View File
@@ -307,15 +307,15 @@ extern "C" void Kotlin_ObjCExport_initializeClass(Class clazz) {
for (int i = 0; i < typeAdapter->directAdapterNum; ++i) {
const ObjCToKotlinMethodAdapter* adapter = typeAdapter->directAdapters + i;
SEL selector = sel_registerName(adapter->selector);
BOOL added = class_addMethod(clazz, selector, adapter->imp, adapter->encoding);
RuntimeAssert(added, "Unexpected selector clash");
class_addMethod(clazz, selector, adapter->imp, adapter->encoding);
// The method above may fail if there is a matching Swift/Obj-C extension method for this Kotlin class.
// This is pretty much ok, and we shouldn't replace that method with our own.
}
for (int i = 0; i < typeAdapter->classAdapterNum; ++i) {
const ObjCToKotlinMethodAdapter* adapter = typeAdapter->classAdapters + i;
SEL selector = sel_registerName(adapter->selector);
BOOL added = class_addMethod(object_getClass(clazz), selector, adapter->imp, adapter->encoding);
RuntimeAssert(added, "Unexpected selector clash");
class_addMethod(object_getClass(clazz), selector, adapter->imp, adapter->encoding);
}
if (isClassForPackage) return;