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

Unwrap fake override on field access

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-01-10 10:34:05 +01:00
parent dfbe92344f
commit d62a7cc9d1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+5 -2
View File
@@ -337,11 +337,14 @@ class ExpressionCodegen(
private fun generateFieldValue(expression: IrFieldAccessExpression, data: BlockInfo): StackValue { private fun generateFieldValue(expression: IrFieldAccessExpression, data: BlockInfo): StackValue {
val receiverValue = expression.receiver?.accept(this, data) ?: StackValue.none() val receiverValue = expression.receiver?.accept(this, data) ?: StackValue.none()
val propertyDescriptor = expression.descriptor val propertyDescriptor = expression.descriptor
val fieldType = typeMapper.mapType(propertyDescriptor.type)
val realDescriptor = DescriptorUtils.unwrapFakeOverride(propertyDescriptor)
val fieldType = typeMapper.mapType(realDescriptor.original.type)
val ownerType = typeMapper.mapImplementationOwner(propertyDescriptor) val ownerType = typeMapper.mapImplementationOwner(propertyDescriptor)
val fieldName = propertyDescriptor.name.asString() val fieldName = propertyDescriptor.name.asString()
val isStatic = expression.receiver == null // TODO val isStatic = expression.receiver == null // TODO
return StackValue.field(fieldType, ownerType, fieldName, isStatic, receiverValue, propertyDescriptor)
return StackValue.field(fieldType, ownerType, fieldName, isStatic, receiverValue, realDescriptor)
} }
override fun visitGetField(expression: IrGetField, data: BlockInfo): StackValue { override fun visitGetField(expression: IrGetField, data: BlockInfo): StackValue {