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

[JS IR] Clean up callable reference lowering

Browse Source
This commit is contained in:
Roman Artemev
2020-03-03 18:52:58 +03:00
committed by romanart
parent 8f0e06ff70
commit 4381a2d81b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CallableReferenceLowering.kt
+2 -5
View File
@@ -105,14 +105,13 @@ class CallableReferenceLowering(private val context: CommonBackendContext) : Bod
private val isLambda: Boolean private val isLambda: Boolean
) { ) {
private val isKReference: Boolean get() = superFunctionInterface.name.identifier[0] == 'K'
private val isSuspendLambda = isLambda && function.isSuspend private val isSuspendLambda = isLambda && function.isSuspend
private val superClass = if (isSuspendLambda) context.ir.symbols.coroutineImpl.owner.defaultType else context.irBuiltIns.anyType
private val superClass = if (isSuspendLambda) context.ir.symbols.coroutineImpl.owner.defaultType else context.irBuiltIns.anyType
private var boundReceiverField: IrField? = null private var boundReceiverField: IrField? = null
private val superFunctionInterface = reference.type.classOrNull?.owner ?: error("Expected functional type") private val superFunctionInterface = reference.type.classOrNull?.owner ?: error("Expected functional type")
private val isKReference = superFunctionInterface.name.identifier[0] == 'K'
private fun buildReferenceClass(): IrClass { private fun buildReferenceClass(): IrClass {
return buildClass { return buildClass {
@@ -303,8 +302,6 @@ class CallableReferenceLowering(private val context: CommonBackendContext) : Bod
private fun createNameProperty(clazz: IrClass) { private fun createNameProperty(clazz: IrClass) {
if (!isKReference) return if (!isKReference) return
// if (superFunctionInterface.name.identifier[0] != 'K') return
val superProperty = superFunctionInterface.declarations.filterIsInstance<IrProperty>().single() val superProperty = superFunctionInterface.declarations.filterIsInstance<IrProperty>().single()
val supperGetter = superProperty.getter ?: error("Expected getter for KFunction.name property") val supperGetter = superProperty.getter ?: error("Expected getter for KFunction.name property")