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

[FIR2IR] Properly extract accessor symbols in FakeOverrideGenerator

Browse Source 
^KT-64432 Fixed
This commit is contained in:
Dmitriy Novozhilov
2024-01-11 14:29:32 +02:00
committed by Space Team
parent 6dd0992288
commit a11705186f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+2 -4
View File
@@ -555,7 +555,6 @@ class FakeOverrideGenerator(
} }
} }
@OptIn(UnsafeDuringIrConstructionAPI::class)
private fun IrProperty.setOverriddenSymbolsForProperty( private fun IrProperty.setOverriddenSymbolsForProperty(
declarationStorage: Fir2IrDeclarationStorage, declarationStorage: Fir2IrDeclarationStorage,
isVar: Boolean, isVar: Boolean,
@@ -564,14 +563,13 @@ class FakeOverrideGenerator(
val overriddenIrSymbols = getOverriddenSymbolsInSupertypes(this, firOverriddenSymbols) { val overriddenIrSymbols = getOverriddenSymbolsInSupertypes(this, firOverriddenSymbols) {
declarationStorage.getIrPropertySymbol(it) as IrPropertySymbol declarationStorage.getIrPropertySymbol(it) as IrPropertySymbol
} }
val overriddenIrProperties = overriddenIrSymbols.map { it.owner }
getter?.apply { getter?.apply {
overriddenSymbols = overriddenIrProperties.mapNotNull { it.getter?.symbol } overriddenSymbols = overriddenIrSymbols.mapNotNull { declarationStorage.findGetterOfProperty(it) }
} }
if (isVar) { if (isVar) {
setter?.apply { setter?.apply {
overriddenSymbols = overriddenIrProperties.mapNotNull { it.setter?.symbol } overriddenSymbols = overriddenIrSymbols.mapNotNull { declarationStorage.findSetterOfProperty(it) }
} }
} }
overriddenSymbols = overriddenIrSymbols overriddenSymbols = overriddenIrSymbols
compiler/testData/codegen/box/collections/removeAtIntOverrideInJava.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-64432
// JVM_ABI_K1_K2_DIFF: KT-57300, KT-63857 // JVM_ABI_K1_K2_DIFF: KT-57300, KT-63857
// FILE: A.java // FILE: A.java