From bf9cd488ef17d9d05f470b874ec309e44767d6ca Mon Sep 17 00:00:00 2001 From: Konstantin Anisimov Date: Fri, 17 Mar 2017 15:59:01 +0700 Subject: [PATCH] Turn inlining in inline functions on --- .../jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt index 88dde8e53bc..9775885b7ce 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt @@ -56,13 +56,10 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid( val fqName = currentFile!!.packageFragmentDescriptor.fqName.asString() // TODO to be removed after stdlib compilation if(fqName.contains("kotlin")) return super.visitCall(expression) // TODO to be removed after stdlib compilation - if (currentFunction == null) return super.visitCall(expression) - if (currentFunction!!.descriptor.isInline) return super.visitCall(expression) // TODO workaround - val functionDescriptor = expression.descriptor as FunctionDescriptor if (functionDescriptor.isInline) { val inlineFunctionBody = inlineFunction(expression) - inlineFunctionBody.transformChildrenVoid(this) // TODO + inlineFunctionBody.transformChildrenVoid(this) return inlineFunctionBody // Return newly created IrInlineBody instead of IrCall. }