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

[JS IR] Fix inline classes for new callable reference scheme

Browse Source
This commit is contained in:
Roman Artemev
2020-02-26 12:17:13 +03:00
committed by romanart
parent 0e67c6ac7d
commit 293ddb5389
1 changed files with 4 additions and 2 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/InteropCallableReferenceLowering.kt
+4 -2
View File
@@ -162,19 +162,21 @@ class InteropCallableReferenceLowering(val context: JsIrBackendContext) : BodyLo
val constructor = expression.symbol.owner val constructor = expression.symbol.owner
val lambdaClass = constructor.parentAsClass val lambdaClass = constructor.parentAsClass
val invokeFun = lambdaClass.declarations.filterIsInstance<IrSimpleFunction>().single { it.name.asString() == "invoke" } val invokeFun = lambdaClass.declarations.filterIsInstance<IrSimpleFunction>().single { it.name.asString() == "invoke" }
val superInvokeFun = invokeFun.overriddenSymbols.single { it.owner.isSuspend == invokeFun.isSuspend }.owner
val lambdaName = Name.identifier("${lambdaClass.name.asString()}\$lambda") val lambdaName = Name.identifier("${lambdaClass.name.asString()}\$lambda")
val lambdaDeclaration = buildFun { val lambdaDeclaration = buildFun {
startOffset = invokeFun.startOffset startOffset = invokeFun.startOffset
endOffset = invokeFun.endOffset endOffset = invokeFun.endOffset
returnType = invokeFun.returnType // Since box/unbox is done on declaration side in case of suspend function use the specified type
returnType = if (invokeFun.isSuspend) invokeFun.returnType else superInvokeFun.returnType
name = lambdaName name = lambdaName
isSuspend = invokeFun.isSuspend isSuspend = invokeFun.isSuspend
} }
lambdaDeclaration.parent = factoryFunction lambdaDeclaration.parent = factoryFunction
lambdaDeclaration.valueParameters = invokeFun.valueParameters.map { it.copyTo(lambdaDeclaration) } lambdaDeclaration.valueParameters = superInvokeFun.valueParameters.map { it.copyTo(lambdaDeclaration) }
val statements = ArrayList<IrStatement>(4) val statements = ArrayList<IrStatement>(4)