From 7243d04f583df7fdc289566a95c183a6cd9e9569 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 19 Jun 2020 16:25:29 +0300 Subject: [PATCH] [FIR2IR] Simplification of property building in lazy class --- .../org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt index 243ba968898..b917b4937d0 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyClass.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.backend.* import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.buildUseSiteMemberScope -import org.jetbrains.kotlin.fir.scopes.impl.FirClassSubstitutionScope import org.jetbrains.kotlin.fir.symbols.Fir2IrClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol @@ -146,14 +145,8 @@ class Fir2IrLazyClass( processedNames += declaration.name scope.processPropertiesByName(declaration.name) { if (it is FirPropertySymbol) { - result += if (!it.isFakeOverride) { - declarationStorage.createIrProperty(it.fir, irParent = this, origin = origin) - } else { - val fakeOverrideSymbol = - FirClassSubstitutionScope.createFakeOverrideProperty(session, it.fir, it) - classifierStorage.preCacheTypeParameters(it.fir) - declarationStorage.createIrProperty(fakeOverrideSymbol.fir, irParent = this) - } + // TODO: replace with getIrFieldOrPropertySymbol(it).owner with lazy property generation + result += declarationStorage.createIrProperty(it.fir, irParent = this, origin = origin) } } }