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

[FIR2IR] Fix generation of type arguments of delegated constructor calls

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-06-08 14:59:36 +03:00
parent 5c6f40b34a
commit 6f0eeecc64
14 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+9 -7
View File
@@ -259,8 +259,8 @@ internal class ClassMemberGenerator(
val firDispatchReceiver = dispatchReceiver
return convertWithOffsets { startOffset, endOffset ->
val irConstructorSymbol = declarationStorage.getIrFunctionSymbol(constructorSymbol) as IrConstructorSymbol
val typeArguments = (constructedTypeRef as? FirResolvedTypeRef)?.type?.typeArguments
if (constructorSymbol.fir.isFromEnumClass || constructorSymbol.fir.returnTypeRef.isEnum) {
val typeArguments = (constructedTypeRef as? FirResolvedTypeRef)?.type?.typeArguments
IrEnumConstructorCallImpl(
startOffset, endOffset,
constructedIrType,
@@ -268,20 +268,22 @@ internal class ClassMemberGenerator(
typeArgumentsCount = typeArguments?.size ?: 0,
valueArgumentsCount = constructorSymbol.fir.valueParameters.size
).apply {
if (typeArguments?.isNotEmpty() == true) {
val irType = (typeArguments.first() as ConeKotlinTypeProjection).type.toIrType()
putTypeArgument(0, irType)
}
}
} else {
IrDelegatingConstructorCallImpl(
startOffset, endOffset,
constructedIrType,
irConstructorSymbol,
valueArgumentsCount = irConstructorSymbol.owner.valueParameters.size,
typeArgumentsCount = irConstructorSymbol.owner.typeParameters.size
typeArgumentsCount = typeArguments?.size ?: 0,
valueArgumentsCount = irConstructorSymbol.owner.valueParameters.size
)
}.let {
if (typeArguments != null) {
for ((index, typeArgument) in typeArguments.withIndex()) {
val irType = (typeArgument as ConeKotlinTypeProjection).type.toIrType()
it.putTypeArgument(index, irType)
}
}
if (firDispatchReceiver !is FirNoReceiverExpression) {
it.dispatchReceiver = visitor.convertToIrExpression(firDispatchReceiver)
}