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

Use more correct KProperty type in PropertyReferenceLowering

Browse Source 
Default type is `KProperty<R>` where R is KProperty's type parameter.
This type doesn't make much sense outside the KProperty's own class
declaration. A more correct type here is `KProperty<*>`, which is the
type used in property delegates in Kotlin
This commit is contained in:
Alexander Udalov
2019-03-26 17:03:44 +01:00
parent 73383d0c20
commit 6bd4d72b81
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceLowering.kt
+8 -4
View File
@@ -75,11 +75,15 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : Class
private val arrayItemGetter = private val arrayItemGetter =
context.ir.symbols.array.owner.functions.single { it.name.asString() == "get" } context.ir.symbols.array.owner.functions.single { it.name.asString() == "get" }
private val kPropertyType = private val kPropertyStarType = IrSimpleTypeImpl(
context.getIrClass(FqName("kotlin.reflect.KProperty")).owner.defaultType context.irBuiltIns.kPropertyClass,
false,
listOf(makeTypeProjection(context.irBuiltIns.anyNType, Variance.OUT_VARIANCE)),
emptyList()
)
private val kPropertiesFieldType = private val kPropertiesFieldType =
context.ir.symbols.array.createType(false, listOf(makeTypeProjection(kPropertyType, Variance.OUT_VARIANCE))) context.ir.symbols.array.createType(false, listOf(makeTypeProjection(kPropertyStarType, Variance.OUT_VARIANCE)))
// Return some declaration the parent of which is the containing class/package for the referenced property. This is // Return some declaration the parent of which is the containing class/package for the referenced property. This is
// a bit of a hack, as the reason for not returning the container itself is the `mapImplementationOwner` call below. // a bit of a hack, as the reason for not returning the container itself is the `mapImplementationOwner` call below.
@@ -365,7 +369,7 @@ internal class PropertyReferenceLowering(val context: JvmBackendContext) : Class
initializer = context.createIrBuilder(irClass.symbol).run { initializer = context.createIrBuilder(irClass.symbol).run {
val initializers = kProperties.values.sortedBy { it.index }.map { it.initializer } val initializers = kProperties.values.sortedBy { it.index }.map { it.initializer }
irExprBody(irCall(this@PropertyReferenceLowering.context.ir.symbols.arrayOf).apply { irExprBody(irCall(this@PropertyReferenceLowering.context.ir.symbols.arrayOf).apply {
putValueArgument(0, IrVarargImpl(startOffset, endOffset, kPropertiesFieldType, kPropertyType, initializers)) putValueArgument(0, IrVarargImpl(startOffset, endOffset, kPropertiesFieldType, kPropertyStarType, initializers))
}) })
} }
}) })