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

Migrate to new lambda detection mechanism

Browse Source
This commit is contained in:
Konstantin Anisimov
2017-12-12 11:43:16 +03:00
committed by KonstantinAnisimov
parent 53b243c9f8
commit 45efa2d0a1
1 changed files with 14 additions and 16 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
+14 -16
View File
@@ -26,10 +26,7 @@ import org.jetbrains.kotlin.backend.konan.descriptors.isFunctionInvoke
import org.jetbrains.kotlin.backend.konan.descriptors.needsInlining import org.jetbrains.kotlin.backend.konan.descriptors.needsInlining
import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride
import org.jetbrains.kotlin.backend.konan.ir.DeserializerDriver import org.jetbrains.kotlin.backend.konan.ir.DeserializerDriver
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.ValueDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.IrStatement
import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrFunction
@@ -47,6 +44,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.types.TypeProjectionImpl
import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.TypeSubstitutor
//-----------------------------------------------------------------------------// //-----------------------------------------------------------------------------//
internal class FunctionInlining(val context: Context): IrElementTransformerVoidWithContext() { internal class FunctionInlining(val context: Context): IrElementTransformerVoidWithContext() {
@@ -238,8 +236,8 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
val needsEvaluation : Boolean val needsEvaluation : Boolean
get() { get() {
if (parameterDescriptor.isNoinline()) return true if (parameterDescriptor.isNoinline()) return true
if (argumentExpression.isLambda()) return false if (argumentExpression.isInlinableBody()) return false
return true // The expression must be evaluated. return true // The expression must be evaluated.
} }
@@ -253,17 +251,17 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
fun IrExpression.isLambda(): Boolean { private fun isAnonymousFunction(descriptor: DeclarationDescriptor): Boolean {
if (this !is IrBlock) return false // Lambda must be represented with IrBlock. return descriptor is SimpleFunctionDescriptor && descriptor.name.asString().contains("<anonymous>")
if (this.origin != IrStatementOrigin.LAMBDA && // Origin must be LAMBDA or ANONYMOUS. }
this.origin != IrStatementOrigin.ANONYMOUS_FUNCTION) return false
val statements = this.statements //-------------------------------------------------------------------------//
val irFunction = statements[0] // Lambda function declaration.
val irCallableReference = statements[1] // Lambda callable reference. fun IrExpression.isInlinableBody(): Boolean {
if (irFunction !is IrFunction) return false // First statement of the block must be lambda declaration. if (this !is IrBlock) return false // Lambda must be represented with IrBlock.
if (irCallableReference !is IrCallableReference) return false // Second statement of the block must be CallableReference. val lastStatement = statements.last()
return true if (lastStatement !is IrCallableReference) return false // Second statement of the lambda block must be CallableReference.
return isAnonymousFunction(lastStatement.descriptor)
} }
} }