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

[K/N] Avoid magic strings in KonanMangler

Browse Source
This commit is contained in:
Sergej Jaskiewicz
2023-08-23 17:09:37 +02:00
committed by teamcity
parent ddfd94b3b2
commit 0fd4f10f6c
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/FirNativeKotlinMangler.kt
+7 -8
View File
@@ -5,10 +5,7 @@
package org.jetbrains.kotlin.fir.backend.native package org.jetbrains.kotlin.fir.backend.native
import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinExportChecker import org.jetbrains.kotlin.backend.common.serialization.mangle.*
import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
import org.jetbrains.kotlin.backend.common.serialization.mangle.SpecialDeclarationType
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.backend.FirMangler import org.jetbrains.kotlin.fir.backend.FirMangler
import org.jetbrains.kotlin.fir.backend.FirExportCheckerVisitor import org.jetbrains.kotlin.fir.backend.FirExportCheckerVisitor
@@ -88,15 +85,17 @@ class FirNativeKotlinMangleComputer(
return buildString { return buildString {
receiverParameter?.let { receiverParameter?.let {
append(it.getTypeName(session)) append(it.getTypeName(session))
append(".") append(MangleConstant.FQN_SEPARATOR)
} }
append("objc:") append(MangleConstant.OBJC_MARK)
append(it.selector) append(it.selector)
if ((this@platformSpecificFunctionName is FirConstructor) && isObjCConstructor(session)) append("#Constructor") if ((this@platformSpecificFunctionName is FirConstructor) && isObjCConstructor(session)) {
append(MangleConstant.OBJC_CONSTRUCTOR_MARK)
}
if (this@platformSpecificFunctionName is FirPropertyAccessor) { if (this@platformSpecificFunctionName is FirPropertyAccessor) {
append("#Accessor") append(MangleConstant.OBJC_PROPERTY_ACCESSOR_MARK)
} }
} }
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/MangleConstant.kt
+4
View File
@@ -47,5 +47,9 @@ enum class MangleConstant(val prefix: Char, val separator: Char, val suffix: Cha
const val FUN_PREFIX = "kfun" const val FUN_PREFIX = "kfun"
const val CLASS_PREFIX = "kclass" const val CLASS_PREFIX = "kclass"
const val FIELD_PREFIX = "kfield" const val FIELD_PREFIX = "kfield"
const val OBJC_MARK = "objc:"
const val OBJC_CONSTRUCTOR_MARK = "#Constructor"
const val OBJC_PROPERTY_ACCESSOR_MARK = "#Accessor"
} }
} }
compiler/ir/serialization.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanMangler.kt
+12 -8
View File
@@ -71,15 +71,17 @@ abstract class AbstractKonanIrMangler(
return buildString { return buildString {
if (extensionReceiverParameter != null) { if (extensionReceiverParameter != null) {
append(extensionReceiverParameter!!.type.getClass()!!.name) append(extensionReceiverParameter!!.type.getClass()!!.name)
append(".") append(MangleConstant.FQN_SEPARATOR)
} }
append("objc:") append(MangleConstant.OBJC_MARK)
append(it.selector) append(it.selector)
if (this@platformSpecificFunctionName is IrConstructor && this@platformSpecificFunctionName.isObjCConstructor) append("#Constructor") if (this@platformSpecificFunctionName is IrConstructor && this@platformSpecificFunctionName.isObjCConstructor) {
append(MangleConstant.OBJC_CONSTRUCTOR_MARK)
}
if ((this@platformSpecificFunctionName as? IrSimpleFunction)?.correspondingPropertySymbol != null) { if ((this@platformSpecificFunctionName as? IrSimpleFunction)?.correspondingPropertySymbol != null) {
append("#Accessor") append(MangleConstant.OBJC_PROPERTY_ACCESSOR_MARK)
} }
} }
} }
@@ -136,15 +138,17 @@ abstract class AbstractKonanDescriptorMangler : DescriptorBasedKotlinManglerImpl
return buildString { return buildString {
if (extensionReceiverParameter != null) { if (extensionReceiverParameter != null) {
append(extensionReceiverParameter!!.type.constructor.declarationDescriptor!!.name) append(extensionReceiverParameter!!.type.constructor.declarationDescriptor!!.name)
append(".") append(MangleConstant.FQN_SEPARATOR)
} }
append("objc:") append(MangleConstant.OBJC_MARK)
append(it.selector) append(it.selector)
if (this@platformSpecificFunctionName is ConstructorDescriptor && this@platformSpecificFunctionName.isObjCConstructor) append("#Constructor") if (this@platformSpecificFunctionName is ConstructorDescriptor && this@platformSpecificFunctionName.isObjCConstructor) {
append(MangleConstant.OBJC_CONSTRUCTOR_MARK)
}
if (this@platformSpecificFunctionName is PropertyAccessorDescriptor) { if (this@platformSpecificFunctionName is PropertyAccessorDescriptor) {
append("#Accessor") append(MangleConstant.OBJC_PROPERTY_ACCESSOR_MARK)
} }
} }
} }