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

JVM_IR: remove descriptors from MethodSignatureMapper

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-05-31 13:52:23 +03:00
parent 77c20066a8
commit 0db02926f5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
+2 -3
View File
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.load.java.* import org.jetbrains.kotlin.load.java.*
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
import org.jetbrains.kotlin.load.kotlin.* import org.jetbrains.kotlin.load.kotlin.*
import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
@@ -180,8 +179,8 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
private fun mapSignature(function: IrFunction, skipGenericSignature: Boolean, skipSpecial: Boolean = false): JvmMethodGenericSignature { private fun mapSignature(function: IrFunction, skipGenericSignature: Boolean, skipSpecial: Boolean = false): JvmMethodGenericSignature {
if (function is IrLazyFunctionBase && function.initialSignatureFunction != null) { if (function is IrLazyFunctionBase && function.initialSignatureFunction != null) {
// Overrides of special builtin in Kotlin classes always have special signature // Overrides of special builtin in Kotlin classes always have special signature
if (function.descriptor.getOverriddenBuiltinReflectingJvmDescriptor() == null || if ((function as? IrSimpleFunction)?.getDifferentNameForJvmBuiltinFunction() == null ||
function.descriptor.containingDeclaration.original is JavaClassDescriptor (function.parent as? IrClass)?.origin == IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
) { ) {
return mapSignature(function.initialSignatureFunction!!, skipGenericSignature) return mapSignature(function.initialSignatureFunction!!, skipGenericSignature)
} }