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

When generating section `__objc_classrefs`, need to consider distinguishing `_OBJC_CLASS_$_` and `_OBJC_METACLASS_$_`
JetBrains · Mar 29, 2024 · abdeced · abdeced
1 parent 757812a
commit abdeced
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 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,14 +1331,17 @@ 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",
                         LlvmRetType(llvm.int8PtrType),
                         listOf(LlvmParamType(llvm.int8PtrType))
                 )
                 call(getClass, listOf(objCClass), exceptionHandler = exceptionHandler)
+
+                val objCMetaclass = getObjCClass(name, isMetaclass = true)
+                call(getClass, listOf(objCMetaclass), exceptionHandler = exceptionHandler)
             } else {
                 getObjCClass(irClass.getExternalObjCClassBinaryName())
             }

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"
 }