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

[IR] Fixed bug with type parameters of referenced constructor

Browse Source
This commit is contained in:
Igor Chevdar
2020-10-29 13:47:04 +05:00
parent c90546104e
commit 07a797cc3a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+6 -2
View File
@@ -390,18 +390,22 @@ class LocalDeclarationsLowering(
val newCallee = oldCallee.transformed ?: return expression val newCallee = oldCallee.transformed ?: return expression
val newReflectionTarget = expression.reflectionTarget?.run { owner.transformed } val newReflectionTarget = expression.reflectionTarget?.run { owner.transformed }
val typeParameters = if (newCallee is IrConstructor)
newCallee.parentAsClass.typeParameters
else
newCallee.typeParameters
return IrFunctionReferenceImpl( return IrFunctionReferenceImpl(
expression.startOffset, expression.endOffset, expression.startOffset, expression.endOffset,
expression.type, // TODO functional type for transformed descriptor expression.type, // TODO functional type for transformed descriptor
newCallee.symbol, newCallee.symbol,
typeArgumentsCount = newCallee.typeParameters.size, typeArgumentsCount = typeParameters.size,
valueArgumentsCount = newCallee.valueParameters.size, valueArgumentsCount = newCallee.valueParameters.size,
reflectionTarget = newReflectionTarget?.symbol, reflectionTarget = newReflectionTarget?.symbol,
origin = expression.origin origin = expression.origin
).also { ).also {
it.fillArguments2(expression, newCallee) it.fillArguments2(expression, newCallee)
it.setLocalTypeArguments(oldCallee) it.setLocalTypeArguments(oldCallee)
it.copyTypeArgumentsFrom(expression, shift = newCallee.typeParameters.size - expression.typeArgumentsCount) it.copyTypeArgumentsFrom(expression, shift = typeParameters.size - expression.typeArgumentsCount)
it.copyAttributes(expression) it.copyAttributes(expression)
} }
} }