From 19ccb230886738ac0ef8642189082e9105500476 Mon Sep 17 00:00:00 2001 From: Pavel Kunyavskiy Date: Mon, 10 Jul 2023 12:01:04 +0200 Subject: [PATCH] [K/N] Fix compilation error caused by bad merge --- .../src/org/jetbrains/kotlin/backend/konan/ObjCInterop.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ObjCInterop.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ObjCInterop.kt index f9e0a3d8b0d..0d3c30f8b99 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ObjCInterop.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ObjCInterop.kt @@ -69,8 +69,10 @@ fun ClassDescriptor.isObjCForwardDeclaration(): Boolean = when (NativeForwardDec NativeForwardDeclarationKind.ObjCProtocol, NativeForwardDeclarationKind.ObjCClass -> true } -fun IrClass.isObjCForwardDeclaration(): Boolean = - getPackageFragment().packageFqName.startsWith(objcnamesForwardDeclarationsPackageName) +fun IrClass.isObjCForwardDeclaration(): Boolean = when (NativeForwardDeclarationKind.packageFqNameToKind[getPackageFragment().packageFqName]) { + null, NativeForwardDeclarationKind.Struct -> false + NativeForwardDeclarationKind.ObjCProtocol, NativeForwardDeclarationKind.ObjCClass -> true +} fun ClassDescriptor.isObjCMetaClass(): Boolean = this.getAllSuperClassifiers().any {