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

JVM_IR: simplify resolveFakeOverride call in SyntheticAccessorLowering

Browse Source
This commit is contained in:
Georgy Bronnikov
2021-05-21 15:02:31 +03:00
parent fca804de14
commit 7e6782d684
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt
+2 -11
View File
@@ -738,7 +738,8 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle
is IrField -> { is IrField -> {
val correspondingProperty = declarationRaw.correspondingPropertySymbol?.owner val correspondingProperty = declarationRaw.correspondingPropertySymbol?.owner
if (correspondingProperty != null && correspondingProperty.isFakeOverride) { if (correspondingProperty != null && correspondingProperty.isFakeOverride) {
val realProperty = correspondingProperty.resolveFakeOverrideForProperty() val realProperty = correspondingProperty.resolveFakeOverride()
?: throw AssertionError("No real override for ${correspondingProperty.render()}")
realProperty.backingField realProperty.backingField
?: throw AssertionError( ?: throw AssertionError(
"Fake override property ${correspondingProperty.render()} with backing field " + "Fake override property ${correspondingProperty.render()} with backing field " +
@@ -771,16 +772,6 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : IrEle
} }
} }
private fun IrProperty.resolveFakeOverrideForProperty(): IrProperty {
if (!isFakeOverride) return this
return this.overriddenSymbols
.map { it.owner }
.collectAndFilterRealOverrides()
.firstOrNull()
?: throw AssertionError("No real override for ${this.render()}")
}
private class OuterClassInfo(val outerClass: IrClass, val throughCrossinlineLambda: Boolean) private class OuterClassInfo(val outerClass: IrClass, val throughCrossinlineLambda: Boolean)
private fun getOuterClassInfo(): OuterClassInfo? { private fun getOuterClassInfo(): OuterClassInfo? {