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

Noinline support

Browse Source 
Bug fix
This commit is contained in:
Konstantin Anisimov
2017-03-22 18:06:00 +07:00
committed by KonstantinAnisimov
parent 26f4271906
commit bfc4e1106a
1 changed files with 8 additions and 2 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
+8 -2
View File
@@ -271,14 +271,16 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
if (irCall !is IrCallImpl) return irCall if (irCall !is IrCallImpl) return irCall
val oldTypeArguments = (irCall as IrMemberAccessExpressionBase).typeArguments val oldTypeArguments = (irCall as IrMemberAccessExpressionBase).typeArguments
if (typeArgsMap == null) return irCall
if (oldTypeArguments == null) return irCall
val substitutionContext = typeArgsMap!!.entries.associate { val substitutionContext = typeArgsMap.entries.associate {
(typeParameter, typeArgument) -> (typeParameter, typeArgument) ->
typeParameter.typeConstructor to TypeProjectionImpl(typeArgument) typeParameter.typeConstructor to TypeProjectionImpl(typeArgument)
} }
val typeSubstitutor = TypeSubstitutor.create(substitutionContext) val typeSubstitutor = TypeSubstitutor.create(substitutionContext)
val newTypeArguments = oldTypeArguments!!.map { val newTypeArguments = oldTypeArguments.map {
val typeParameterDescriptor = it.key val typeParameterDescriptor = it.key
val oldTypeArgument = it.value val oldTypeArgument = it.value
val newTypeArgument = typeSubstitutor.substitute(oldTypeArgument, Variance.INVARIANT) ?: oldTypeArgument val newTypeArgument = typeSubstitutor.substitute(oldTypeArgument, Variance.INVARIANT) ?: oldTypeArgument
@@ -377,6 +379,10 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
val lambdaArgument = substituteMap[dispatchReceiver.descriptor] // Find expression to replace this parameter. val lambdaArgument = substituteMap[dispatchReceiver.descriptor] // Find expression to replace this parameter.
if (lambdaArgument == null) return super.visitCall(irCall) // It is not function parameter - nothing to substitute. if (lambdaArgument == null) return super.visitCall(irCall) // It is not function parameter - nothing to substitute.
val dispatchDescriptor = dispatchReceiver.descriptor
if (dispatchDescriptor is ValueParameterDescriptor &&
dispatchDescriptor.isNoinline) return super.visitCall(irCall)
val lambdaFunction = getLambdaFunction(lambdaArgument) val lambdaFunction = getLambdaFunction(lambdaArgument)
if (lambdaFunction == null) return super.visitCall(irCall) // TODO if (lambdaFunction == null) return super.visitCall(irCall) // TODO