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

[kotlin compiler][update][TO DELETE] workaround over inliner's disability to process FUN_EXPR

Browse Source
This commit is contained in:
Vasily Levchenko
2019-07-26 12:31:40 +03:00
parent 9dc3dab179
commit 251f5c9032
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+5 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.backend.konan.Context
import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride
import org.jetbrains.kotlin.backend.konan.ir.* import org.jetbrains.kotlin.backend.konan.ir.*
import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.backend.common.lower.ProvisionalFunctionExpressionLowering
import org.jetbrains.kotlin.descriptors.ValueDescriptor import org.jetbrains.kotlin.descriptors.ValueDescriptor
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.IrStatement
@@ -52,7 +53,10 @@ internal class FunctionInlining(val context: Context) : IrElementTransformerVoid
if (callee.isTypeOfIntrinsic()) if (callee.isTypeOfIntrinsic())
return expression return expression
val actualCallee = getFunctionDeclaration(callee.symbol) /**
* HACK: it's temporary workaround over inliner's disability to work with IrFunctionExpression, should be removed.
*/
val actualCallee = getFunctionDeclaration(callee.symbol).transform(ProvisionalFunctionExpressionLowering(), null) as IrFunction
val parent = allScopes.map { it.irElement }.filterIsInstance<IrDeclarationParent>().lastOrNull() val parent = allScopes.map { it.irElement }.filterIsInstance<IrDeclarationParent>().lastOrNull()