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

Fix handling nil result of NSSet.member for Kotlin Set (#1314)

Browse Source
This commit is contained in:
SvyatoslavScherbina
2018-02-12 18:59:31 +03:00
committed by Nikolay Igotti
parent d047f72a2e
commit 12bec9b22f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/ObjCExportCollections.mm
+4 -1
View File
@@ -294,7 +294,10 @@ static inline id KSet_getElement(KRef set, id object) {
ObjHolder requestHolder, resultHolder; ObjHolder requestHolder, resultHolder;
KRef request = Kotlin_ObjCExport_refFromObjC(object, requestHolder.slot()); KRef request = Kotlin_ObjCExport_refFromObjC(object, requestHolder.slot());
KRef result = Kotlin_Set_getElement(set, request, resultHolder.slot()); KRef result = Kotlin_Set_getElement(set, request, resultHolder.slot());
return refToObjCOrNSNull(result);
// Note: if result is nullptr, then it can't be a null element of the set, because request != nullptr;
// so map nullptr to nullptr:
return Kotlin_ObjCExport_refToObjC(result);
} }
} }