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

IR: take care of supertypes when copying IrTypeParameters

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-09-08 21:12:49 +03:00
parent 916d66c220
commit 67d7bf3269
14 changed files with 145 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -12476,6 +12476,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
+7 -1
View File
@@ -224,7 +224,7 @@ private fun IrTypeParameter.copySuperTypesFrom(source: IrTypeParameter, srcToDst
val target = this
val sourceParent = source.parent as IrTypeParametersContainer
val targetParent = target.parent as IrTypeParametersContainer
target.superTypes += source.superTypes.map {
target.superTypes = source.superTypes.map {
it.remapTypeParameters(sourceParent, targetParent, srcToDstParameterMap)
}
}
@@ -596,6 +596,12 @@ private fun IrSimpleFunction.copyAndRenameConflictingTypeParametersFrom(
})
}
val zipped = contextParameters.zip(newParameters)
val parameterMap = zipped.toMap()
for ((oldParameter, newParameter) in zipped) {
newParameter.copySuperTypesFrom(oldParameter, parameterMap)
}
typeParameters = typeParameters + newParameters
return newParameters
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ClosureAnnotator.kt
+6
View File
@@ -223,6 +223,12 @@ class ClosureAnnotator(irElement: IrElement, declaration: IrDeclaration) {
includeInParent(closureBuilder)
}
override fun visitTypeParameter(declaration: IrTypeParameter, data: ClosureBuilder?) {
for (superType in declaration.superTypes) {
data?.seeType(superType)
}
}
override fun visitValueAccess(expression: IrValueAccessExpression, data: ClosureBuilder?) {
data?.seeVariable(expression.symbol)
super.visitValueAccess(expression, data)
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+3 -70
View File
@@ -22,14 +22,9 @@ import org.jetbrains.kotlin.ir.builders.declarations.buildValueParameter
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.*
import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
import org.jetbrains.kotlin.ir.symbols.IrValueParameterSymbol
import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
import org.jetbrains.kotlin.ir.types.impl.IrTypeAbbreviationImpl
import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
@@ -195,28 +190,7 @@ class LocalDeclarationsLowering(
}
private fun LocalContext.remapType(type: IrType): IrType {
if (type !is IrSimpleType) return type
val classifier = (type.classifier as? IrTypeParameterSymbol)?.let { capturedTypeParameterToTypeParameter[it.owner]?.symbol }
?: type.classifier
val arguments = type.arguments.map { remapTypeArgument(it) }
return IrSimpleTypeImpl(
classifier, type.hasQuestionMark, arguments, type.annotations,
type.abbreviation?.let { remapTypeAbbreviation(it) }
)
}
private fun LocalContext.remapTypeArgument(argument: IrTypeArgument) =
(argument as? IrTypeProjection)?.let { makeTypeProjection(remapType(it.type), it.variance) }
?: argument
private fun LocalContext.remapTypeAbbreviation(abbreviation: IrTypeAbbreviation): IrTypeAbbreviation =
IrTypeAbbreviationImpl(
abbreviation.typeAlias, // TODO: if/when the language gets local or nested type aliases, this will need remapping.
abbreviation.hasQuestionMark,
abbreviation.arguments.map { remapTypeArgument(it) },
abbreviation.annotations
)
private fun LocalContext.remapType(type: IrType): IrType = typeRemapper.remapType(type)
@OptIn(ObsoleteDescriptorBasedAPI::class)
private inner class LocalDeclarationsTransformer(
@@ -252,14 +226,13 @@ class LocalDeclarationsLowering(
localFunctions.values.forEach {
it.transformedDeclaration.apply {
val original = it.declaration
val typeRemapper = TypeParameterAdjustmentTypeRemapper(it.capturedTypeParameterToTypeParameter)
this.body = original.body
this.body?.remapTypes(typeRemapper)
this.body?.remapTypes(it.typeRemapper)
original.valueParameters.filter { v -> v.defaultValue != null }.forEach { argument ->
val body = argument.defaultValue!!
body.remapTypes(typeRemapper)
body.remapTypes(it.typeRemapper)
oldParameterToNew[argument]!!.defaultValue = body
}
acceptChildren(SetDeclarationsParentVisitor, this)
@@ -930,45 +903,5 @@ class LocalDeclarationsLowering(
}
}
class TypeParameterAdjustmentTypeRemapper(val typeParameterMap: Map<IrTypeParameter, IrTypeParameter>) : TypeRemapper {
override fun enterScope(irTypeParametersContainer: IrTypeParametersContainer) {}
override fun leaveScope() {}
override fun remapType(type: IrType): IrType =
if (type !is IrSimpleType)
type
else
IrSimpleTypeImpl(
null,
type.classifier.remap(),
type.hasQuestionMark,
type.arguments.map { it.remap() },
type.annotations,
type.abbreviation?.remap()
).apply {
annotations.forEach { it.remapTypes(this@TypeParameterAdjustmentTypeRemapper) }
}
private fun IrClassifierSymbol.remap() =
(owner as? IrTypeParameter)?.let { typeParameterMap[it]?.symbol }
?: this
private fun IrTypeArgument.remap() =
if (this is IrTypeProjection)
makeTypeProjection(remapType(type), variance)
else
this
private fun IrTypeAbbreviation.remap() =
IrTypeAbbreviationImpl(
typeAlias,
hasQuestionMark,
arguments.map { it.remap() },
annotations
).apply {
annotations.forEach { it.remapTypes(this@TypeParameterAdjustmentTypeRemapper) }
}
}
// Local inner classes capture anything through outer
internal fun IrClass.isLocalNotInner(): Boolean = visibility == DescriptorVisibilities.LOCAL && !isInner
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/declarations/IrTypeParameterBuilder.kt
+1 -1
View File
@@ -21,6 +21,6 @@ class IrTypeParameterBuilder : IrDeclarationBuilder() {
index = from.index
variance = from.variance
isReified = from.isReified
superTypes.addAll(from.superTypes)
// Do not copy superTypes. You typically want a remapping for a group of type parameters at a time, see IrTypeParameterRemapper.
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrTypeParameterRemapper.kt
+59
View File
@@ -0,0 +1,59 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.ir.util
import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
import org.jetbrains.kotlin.ir.types.impl.IrTypeAbbreviationImpl
import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
/* After moving an IrElement, some type parameter references within it may become out of scope.
This remapper restores validity by redirecting those references to new type parameters.
*/
class IrTypeParameterRemapper(
val typeParameterMap: Map<IrTypeParameter, IrTypeParameter>
) : TypeRemapper {
override fun enterScope(irTypeParametersContainer: IrTypeParametersContainer) {}
override fun leaveScope() {}
override fun remapType(type: IrType): IrType =
if (type !is IrSimpleType)
type
else
IrSimpleTypeImpl(
null,
type.classifier.remap(),
type.hasQuestionMark,
type.arguments.map { it.remap() },
type.annotations,
type.abbreviation?.remap()
).apply {
annotations.forEach { it.remapTypes(this@IrTypeParameterRemapper) }
}
private fun IrClassifierSymbol.remap() =
(owner as? IrTypeParameter)?.let { typeParameterMap[it]?.symbol }
?: this
private fun IrTypeArgument.remap() =
if (this is IrTypeProjection)
makeTypeProjection(remapType(type), variance)
else
this
private fun IrTypeAbbreviation.remap() =
IrTypeAbbreviationImpl(
typeAlias,
hasQuestionMark,
arguments.map { it.remap() },
annotations
).apply {
annotations.forEach { it.remapTypes(this@IrTypeParameterRemapper) }
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RemapTypes.kt
+13 -3
View File
@@ -24,9 +24,9 @@ private class RemapTypesHelper(private val typeRemapper: TypeRemapper) : IrEleme
element.acceptChildrenVoid(this)
}
override fun visitExpression(expression: IrExpression) {
expression.type = typeRemapper.remapType(expression.type)
super.visitExpression(expression)
override fun visitClass(declaration: IrClass) {
declaration.superTypes = declaration.superTypes.map { typeRemapper.remapType(it) }
super.visitClass(declaration)
}
override fun visitValueParameter(declaration: IrValueParameter) {
@@ -34,6 +34,11 @@ private class RemapTypesHelper(private val typeRemapper: TypeRemapper) : IrEleme
super.visitValueParameter(declaration)
}
override fun visitTypeParameter(declaration: IrTypeParameter) {
declaration.superTypes = declaration.superTypes.map { typeRemapper.remapType(it) }
super.visitTypeParameter(declaration)
}
override fun visitVariable(declaration: IrVariable) {
declaration.type = typeRemapper.remapType(declaration.type)
super.visitVariable(declaration)
@@ -59,6 +64,11 @@ private class RemapTypesHelper(private val typeRemapper: TypeRemapper) : IrEleme
super.visitTypeAlias(declaration)
}
override fun visitExpression(expression: IrExpression) {
expression.type = typeRemapper.remapType(expression.type)
super.visitExpression(expression)
}
override fun visitTypeOperator(expression: IrTypeOperatorCall) {
expression.typeOperand = typeRemapper.remapType(expression.typeOperand)
super.visitTypeOperator(expression)
compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
interface I<TT> {
fun id(x: TT) = x
}
fun <T> forClass(x: T): T {
fun g(z: T): T {
class C : I<T>
return C().id(z)
}
return g(x)
}
fun <T> forTypeParameter(x: T): T {
fun <S : T> h(z: S) = z
return h(x)
}
fun box() = forClass("O") + forTypeParameter("K")
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -13871,6 +13871,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13871,6 +13871,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -12476,6 +12476,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -10731,6 +10731,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -10731,6 +10731,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -10731,6 +10731,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@TestMetadata("boundTypeParameterInSupertype.kt")
public void testBoundTypeParameterInSupertype() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/boundTypeParameterInSupertype.kt");
}
@TestMetadata("callBetweenLocalFunctions.kt")
public void testCallBetweenLocalFunctions() throws Exception {
runTest("compiler/testData/codegen/box/functions/localFunctions/callBetweenLocalFunctions.kt");