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

IR: handle varargElementType in LocalDeclarationsLowering

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-09-09 22:10:30 +03:00
parent 8990344bb2
commit 3041a2815c
2 changed files with 18 additions and 8 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
+17 -8
View File
@@ -190,7 +190,15 @@ class LocalDeclarationsLowering(
}
private fun LocalContext.remapType(type: IrType): IrType = typeRemapper.remapType(type)
private fun LocalContext.remapType(type: IrType): IrType {
if (capturedTypeParameterToTypeParameter.isEmpty()) return type
return typeRemapper.remapType(type)
}
private fun LocalContext.remapTypes(body: IrBody) {
if (capturedTypeParameterToTypeParameter.isEmpty()) return
body.remapTypes(typeRemapper)
}
@OptIn(ObsoleteDescriptorBasedAPI::class)
private inner class LocalDeclarationsTransformer(
@@ -223,21 +231,21 @@ class LocalDeclarationsLowering(
}
private fun insertLoweredDeclarationForLocalFunctions() {
localFunctions.values.forEach {
it.transformedDeclaration.apply {
val original = it.declaration
localFunctions.values.forEach { localContext ->
localContext.transformedDeclaration.apply {
val original = localContext.declaration
this.body = original.body
this.body?.remapTypes(it.typeRemapper)
this.body?.let { localContext.remapTypes(it) }
original.valueParameters.filter { v -> v.defaultValue != null }.forEach { argument ->
val body = argument.defaultValue!!
body.remapTypes(it.typeRemapper)
localContext.remapTypes(body)
oldParameterToNew[argument]!!.defaultValue = body
}
acceptChildren(SetDeclarationsParentVisitor, this)
}
it.ownerForLoweredDeclaration.addChild(it.transformedDeclaration)
localContext.ownerForLoweredDeclaration.addChild(localContext.transformedDeclaration)
}
}
@@ -642,7 +650,8 @@ class LocalDeclarationsLowering(
v.copyTo(
newDeclaration,
index = v.index + capturedValues.size,
type = localFunctionContext.remapType(v.type)
type = localFunctionContext.remapType(v.type),
varargElementType = v.varargElementType?.let { localFunctionContext.remapType(it) }
).also {
newParameterToOld.putAbsentOrSame(it, v)
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RemapTypes.kt
+1
View File
@@ -31,6 +31,7 @@ private class RemapTypesHelper(private val typeRemapper: TypeRemapper) : IrEleme
override fun visitValueParameter(declaration: IrValueParameter) {
declaration.type = typeRemapper.remapType(declaration.type)
declaration.varargElementType = declaration.varargElementType?.let { typeRemapper.remapType(it) }
super.visitValueParameter(declaration)
}