From a40604b640997b93e1686fef378c75bb24cc86ad Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 10 Oct 2019 16:00:16 +0300 Subject: [PATCH] Remove some hardcoded names from ObjCExport code generator --- .../llvm/objcexport/ObjCExportCodeGenerator.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt index e9e17695063..049b8f9b46a 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt @@ -24,10 +24,7 @@ import org.jetbrains.kotlin.descriptors.konan.CurrentKlibModuleOrigin import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.types.* -import org.jetbrains.kotlin.ir.util.constructedClass -import org.jetbrains.kotlin.ir.util.isInterface -import org.jetbrains.kotlin.ir.util.isReal -import org.jetbrains.kotlin.ir.util.parentAsClass +import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.name.Name @@ -230,10 +227,10 @@ internal class ObjCExportCodeGenerator( internal fun emitRtti() { NSNumberKind.values().mapNotNull { it.mappedKotlinClassId }.forEach { - dataGenerator.exportClass("Kotlin${it.shortClassName}") + dataGenerator.exportClass(namer.numberBoxName(it).binaryName) } - dataGenerator.exportClass("KotlinMutableSet") - dataGenerator.exportClass("KotlinMutableDictionary") + dataGenerator.exportClass(namer.mutableSetName.binaryName) + dataGenerator.exportClass(namer.mutableMapName.binaryName) emitSpecialClassesConvertions() @@ -520,7 +517,7 @@ private fun ObjCExportCodeGenerator.emitBoxConverter( val value = kotlinToObjC(kotlinValue, objCValueType) - val nsNumberSubclass = genGetLinkedClass("Kotlin${boxClass.name}") + val nsNumberSubclass = genGetLinkedClass(namer.numberBoxName(boxClass.classId!!).binaryName) ret(genSendMessage(int8TypePtr, nsNumberSubclass, nsNumberFactorySelector, value)) }