[K/N][Tests] Fix crashes when casting to an Obj-C class companion

JetBrains · Mar 29, 2024 · a110cd6 · a110cd6
1 parent 757812a
commit a110cd6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
@@ -1331,7 +1331,7 @@ internal abstract class FunctionGenerationContext(
             generationState.dependenciesTracker.add(irClass)
             if (irClass.isObjCMetaClass()) {
                 val name = irClass.getExternalObjCMetaClassBinaryName()
-                val objCClass = getObjCClass(name, isMetaclass = true)
+                val objCClass = getObjCClass(name)
 
                 val getClass = llvm.externalNativeRuntimeFunction(
                         "object_getClass",
@@ -1364,8 +1364,7 @@ internal abstract class FunctionGenerationContext(
         }
     }
 
-    private fun getObjCClass(binaryName: String, isMetaclass: Boolean = false) =
-            load(llvm.int8PtrType, codegen.objCDataGenerator!!.genClassRef(binaryName, isMetaclass).llvm)
+    private fun getObjCClass(binaryName: String) = load(llvm.int8PtrType, codegen.objCDataGenerator!!.genClassRef(binaryName).llvm)
 
     fun getObjCClassFromNativeRuntime(binaryName: String): LLVMValueRef {
         generationState.dependenciesTracker.addNativeRuntime()

diff --git a/...r/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objc/ObjCDataGenerator.kt b/...r/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objc/ObjCDataGenerator.kt
@@ -44,9 +44,8 @@ internal class ObjCDataGenerator(val codegen: CodeGenerator) {
         global.pointer
     }
 
-    fun genClassRef(name: String, isMetaclass: Boolean = false): ConstPointer = classRefs.getOrPut(name) {
-        // Need to distinguish between _OBJC_CLASS_$_ and _OBJC_METACLASS_$_
-        val classGlobal = getClassGlobal(name, isMetaclass)
+    fun genClassRef(name: String): ConstPointer = classRefs.getOrPut(name) {
+        val classGlobal = getClassGlobal(name, isMetaclass = false)
         val global = codegen.staticData.placeGlobal("OBJC_CLASSLIST_REFERENCES_\$_", classGlobal).also {
             it.setLinkage(LLVMLinkage.LLVMPrivateLinkage)
             it.setSection("__DATA,__objc_classrefs,regular,no_dead_strip")

diff --git a/native/native.tests/testData/codegen/cinterop/objc/kt65260.kt b/native/native.tests/testData/codegen/cinterop/objc/kt65260.kt
@@ -7,18 +7,37 @@
 @file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)
 import platform.Foundation.*
 import platform.darwin.*
+import kotlinx.cinterop.internal.*
 import kotlin.test.*
 
-fun box(): String {
+fun test1() {
     try {
-        // Test: cast to NSObject Metaclass
         Any() as NSObject.Companion
-        // Test: cast to subclass of NSObject Metaclass
-        Any() as NSString.Companion
-        Any() as NSArray.Companion
     } catch (e: Exception) {
-        // Cannot access 'TypeCastException': it is internal in Kotlin/Native.
         assertTrue(e is ClassCastException)
     }
+}
+
+fun test2() {
+    try {
+        Any() as NSNumber.Companion
+    } catch (e: Exception) {
+        assertTrue(e is ClassCastException)
+    }
+}
+
+fun test3() {
+    assertFalse(Any() is NSObject.Companion)
+    assertFalse(Any() is NSNumber.Companion)
+
+    val nsObjectClass: Any = NSObject
+    assertFalse(nsObjectClass is NSNumberMeta)
+}
+
+fun box(): String {
+    test1()
+    test2()
+    test3()
+
     return "OK"
 }