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

[Psi2Ir] Fix overridden symbols of Delegated Properties

Browse Source
This commit is contained in:
Roman Artemev
2021-06-07 14:52:27 +03:00
committed by teamcityserver
parent 32bbc3b8ad
commit cb130181a2
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+9
View File
@@ -292,11 +292,20 @@ class ClassGenerator(
irProperty.setter = generateDelegatedFunction(irDelegate, delegatedDescriptor.setter!!, delegateToDescriptor.setter!!) irProperty.setter = generateDelegatedFunction(irDelegate, delegatedDescriptor.setter!!, delegateToDescriptor.setter!!)
} }
irProperty.generateOverrides(delegatedDescriptor)
irProperty.linkCorrespondingPropertySymbol() irProperty.linkCorrespondingPropertySymbol()
return irProperty return irProperty
} }
private fun IrProperty.generateOverrides(propertyDescriptor: PropertyDescriptor) {
overriddenSymbols =
propertyDescriptor.overriddenDescriptors.map { overriddenPropertyDescriptor ->
context.symbolTable.referenceProperty(overriddenPropertyDescriptor.original)
}
}
private fun generateDelegatedFunction( private fun generateDelegatedFunction(
irClass: IrClass, irClass: IrClass,
irDelegate: IrField, irDelegate: IrField,