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

JVM_IR: implement getJvmNameIfSpecial in MethodSignatureMapper

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-05-22 15:39:27 +03:00
parent 986b13c3a1
commit 80afe42d17
3 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/SpecialBridgeMethods.kt
+2 -2
View File
@@ -113,7 +113,7 @@ class SpecialBridgeMethods(val context: CommonBackendContext) {
}
}
fun IrSimpleFunction.allOverridden(): Sequence<IrSimpleFunction> {
fun IrSimpleFunction.allOverridden(includeSelf: Boolean = false): Sequence<IrSimpleFunction> {
val visited = mutableSetOf<IrSimpleFunction>()
fun IrSimpleFunction.search(): Sequence<IrSimpleFunction> {
@@ -125,5 +125,5 @@ fun IrSimpleFunction.allOverridden(): Sequence<IrSimpleFunction> {
}
}
return search().drop(1) // First element is `this`
return if (includeSelf) search() else search().drop(1)
}
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
+56 -14
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.isCompiledToJvmDefault
import org.jetbrains.kotlin.backend.jvm.ir.propertyIfAccessor
import org.jetbrains.kotlin.backend.jvm.lower.suspendFunctionOriginal
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
import org.jetbrains.kotlin.codegen.JvmCodegenUtil
import org.jetbrains.kotlin.codegen.replaceValueParametersIn
import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
@@ -32,17 +33,16 @@ import org.jetbrains.kotlin.ir.expressions.IrConst
import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.java.*
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
import org.jetbrains.kotlin.load.java.getJvmMethodNameIfSpecial
import org.jetbrains.kotlin.load.java.getOverriddenBuiltinReflectingJvmDescriptor
import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
import org.jetbrains.kotlin.load.kotlin.forceSingleValueParameterBoxing
import org.jetbrains.kotlin.load.kotlin.getJvmModuleNameForDeserializedDescriptor
import org.jetbrains.kotlin.load.kotlin.signatures
import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodGenericSignature
import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind
import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.commons.Method
@@ -64,14 +64,16 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
return sw.makeJavaGenericSignature()
}
fun mapFunctionName(function: IrFunction): String {
if (function.origin != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB) {
val platformName = function.getJvmNameFromAnnotation()
if (platformName != null) return platformName
}
fun mapFunctionName(function: IrFunction, skipSpecial: Boolean = false): String {
if (!skipSpecial) {
if (function.origin != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB) {
val platformName = function.getJvmNameFromAnnotation()
if (platformName != null) return platformName
}
val nameForSpecialFunction = getJvmMethodNameIfSpecial(function.descriptor)
if (nameForSpecialFunction != null) return nameForSpecialFunction
val nameForSpecialFunction = getJvmMethodNameIfSpecial(function)
if (nameForSpecialFunction != null) return nameForSpecialFunction
}
val property = (function as? IrSimpleFunction)?.correspondingPropertySymbol?.owner
if (property != null && function.name.isSpecial) {
@@ -175,7 +177,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
fun mapSignatureWithGeneric(function: IrFunction): JvmMethodGenericSignature =
mapSignature(function, false)
private fun mapSignature(function: IrFunction, skipGenericSignature: Boolean): JvmMethodGenericSignature {
private fun mapSignature(function: IrFunction, skipGenericSignature: Boolean, skipSpecial: Boolean = false): JvmMethodGenericSignature {
if (function is IrLazyFunctionBase && function.initialSignatureFunction != null) {
// Overrides of special builtin in Kotlin classes always have special signature
if (function.descriptor.getOverriddenBuiltinReflectingJvmDescriptor() == null ||
@@ -210,7 +212,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
mapReturnType(function, sw)
sw.writeReturnTypeEnd()
val signature = sw.makeJvmMethodSignature(mapFunctionName(function))
val signature = sw.makeJvmMethodSignature(mapFunctionName(function, skipSpecial))
val specialSignatureInfo = with(BuiltinMethodsWithSpecialGenericSignature) { function.descriptor.getSpecialSignatureInfo() }
@@ -345,4 +347,44 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
}
return current
}
}
private fun getJvmMethodNameIfSpecial(irFunction: IrFunction): String? =
(irFunction as? IrSimpleFunction)?.run {
getBuiltinSpecialPropertyGetterName() ?: getDifferentNameForJvmBuiltinFunction()
}
private val IrSimpleFunction.isBuiltIn: Boolean
get() = getPackageFragment()?.fqName == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME ||
parent.safeAs<IrClass>()?.fqNameWhenAvailable?.toUnsafe()?.let(JavaToKotlinClassMap::mapKotlinToJava) != null
// From BuiltinMethodsWithDifferentJvmName.isBuiltinFunctionWithDifferentNameInJvm, BuiltinMethodsWithDifferentJvmName.getJvmName
private fun IrSimpleFunction.getDifferentNameForJvmBuiltinFunction(): String? {
if (name !in BuiltinMethodsWithDifferentJvmName.ORIGINAL_SHORT_NAMES) return null
if (!isBuiltIn) return null
return allOverridden(includeSelf = true)
.filter { it.isBuiltIn }
.mapNotNull {
val signature = it.computeJvmSignature()
BuiltinMethodsWithDifferentJvmName.SIGNATURE_TO_JVM_REPRESENTATION_NAME[signature]?.asString()
}
.firstOrNull()
}
private fun IrSimpleFunction.getBuiltinSpecialPropertyGetterName(): String? {
val propertyName = correspondingPropertySymbol?.owner?.name ?: return null
if (propertyName !in BuiltinSpecialProperties.SPECIAL_SHORT_NAMES) return null
if (!isBuiltIn) return null
return allOverridden(includeSelf = true)
.mapNotNull {
val property = it.correspondingPropertySymbol!!.owner
BuiltinSpecialProperties.PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP[property.fqNameWhenAvailable]?.asString()
}
.firstOrNull()
}
private fun IrFunction.computeJvmSignature(): String = signatures {
val classPart = typeMapper.mapType(parentAsClass.defaultType).internalName
val signature = mapSignature(this@computeJvmSignature, skipGenericSignature = false, skipSpecial = true).toString()
return signature(classPart, signature)
}
}
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
+3 -3
View File
@@ -67,8 +67,8 @@ object BuiltinSpecialProperties {
.map { Pair(it.key.shortName(), it.value) }
.groupBy({ it.second }, { it.first })
private val SPECIAL_FQ_NAMES = PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP.keys
internal val SPECIAL_SHORT_NAMES = SPECIAL_FQ_NAMES.map(FqName::shortName).toSet()
val SPECIAL_FQ_NAMES = PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP.keys
val SPECIAL_SHORT_NAMES = SPECIAL_FQ_NAMES.map(FqName::shortName).toSet()
fun hasBuiltinSpecialPropertyFqName(callableMemberDescriptor: CallableMemberDescriptor): Boolean {
if (callableMemberDescriptor.name !in SPECIAL_SHORT_NAMES) return false
@@ -231,7 +231,7 @@ object BuiltinMethodsWithDifferentJvmName {
)
}
private val SIGNATURE_TO_JVM_REPRESENTATION_NAME: Map<String, Name> =
val SIGNATURE_TO_JVM_REPRESENTATION_NAME: Map<String, Name> =
NAME_AND_SIGNATURE_TO_JVM_REPRESENTATION_NAME_MAP.mapKeys { it.key.signature }
val ORIGINAL_SHORT_NAMES: List<Name> = NAME_AND_SIGNATURE_TO_JVM_REPRESENTATION_NAME_MAP.keys.map { it.name }