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

[K/N] Remap type args of SAM interfaces in FunctionReferenceLowering

Browse Source 
#KT-56188 Fixed
This commit is contained in:
Sergej Jaskiewicz
2023-01-26 20:40:20 +01:00
committed by Space Team
parent 61fc3e99b1
commit bd18fd40ea
13 changed files with 107 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt
+15 -8
View File
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.ir.builders.declarations.*
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.*
@@ -130,7 +131,7 @@ internal class FunctionReferenceLowering(val generationState: NativeGenerationSt
return super.visitTypeOperator(expression)
}
reference.transformChildrenVoid()
return transformFunctionReference(reference, expression.typeOperand.erasure())
return transformFunctionReference(reference, expression.typeOperand)
}
return super.visitTypeOperator(expression)
}
@@ -254,13 +255,18 @@ internal class FunctionReferenceLowering(val generationState: NativeGenerationSt
typeParametersFromEnclosingScope.zip(functionReferenceClass.typeParameters).toMap()
)
private val functionParameterAndReturnTypes = (functionReference.type as IrSimpleType).arguments.map {
when (it) {
is IrTypeProjection -> typeParameterRemapper.remapType(it.type)
is IrStarProjection -> context.irBuiltIns.anyNType
private fun IrType.remappedTypeArguments(): List<IrType> {
if (this !is IrSimpleType) return emptyList()
return arguments.mapIndexed { index, typeArgument ->
when (typeArgument) {
is IrTypeProjection -> typeParameterRemapper.remapType(typeArgument.type)
is IrStarProjection -> (classifier as IrClassSymbol).owner.typeParameters[index].defaultType.erasure()
}
}
}
private val functionParameterAndReturnTypes = functionReference.type.remappedTypeArguments()
private val functionParameterTypes = functionParameterAndReturnTypes.dropLast(1)
private val functionReturnType = functionParameterAndReturnTypes.last()
@@ -330,9 +336,10 @@ internal class FunctionReferenceLowering(val generationState: NativeGenerationSt
val superTypes = mutableListOf(superClass)
val transformedSuperMethod: IrSimpleFunction
if (samSuperType != null) {
superTypes += samSuperType
val samSuperClass = samSuperType.classOrNull ?: error("Expected a class but was: ${samSuperType.render()}")
transformedSuperMethod = samSuperClass.functions.single { it.owner.modality == Modality.ABSTRACT }.owner
val remappedSuperType = (samSuperType.classOrNull ?: error("Expected a class but was: ${samSuperType.render()}"))
.typeWith(samSuperType.remappedTypeArguments())
superTypes += remappedSuperType
transformedSuperMethod = remappedSuperType.classOrNull!!.functions.single { it.owner.modality == Modality.ABSTRACT }.owner
} else {
val numberOfParameters = unboundFunctionParameters.size
if (isKSuspendFunction) {