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

Fix bug in local declarations lowering

Browse Source 
IrCall doesn't provide `.shallowCopy` now, so the unreachable buggy code
became reachable.
This commit is contained in:
Svyatoslav Scherbina
2017-05-04 13:15:03 +03:00
committed by SvyatoslavScherbina
parent 0b1e7c9526
commit 68e6ff614d
1 changed files with 2 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/common/lower/LocalDeclarationsLowering.kt
+2 -2
View File
@@ -402,13 +402,13 @@ class LocalDeclarationsLowering(val context: BackendContext) : DeclarationContai
) )
private fun remapTypeArguments(oldExpression: IrMemberAccessExpression, newCallee: CallableDescriptor): Map<TypeParameterDescriptor, KotlinType>? { private fun remapTypeArguments(oldExpression: IrMemberAccessExpression, newCallee: CallableDescriptor): Map<TypeParameterDescriptor, KotlinType>? {
val oldCallee = oldExpression.descriptor val oldCallee = oldExpression.descriptor.original
return if (oldCallee.typeParameters.isEmpty()) return if (oldCallee.typeParameters.isEmpty())
null null
else oldCallee.typeParameters.associateBy( else oldCallee.typeParameters.associateBy(
{ newCallee.typeParameters[it.index] }, { newCallee.typeParameters[it.index] },
{ oldExpression.getTypeArgument(it)!! } { oldExpression.getTypeArgumentOrDefault(it) }
) )
} }