From 97005e5f78be7b063c96d1ee1534015a930451f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 12 Sep 2023 16:08:19 +0300 Subject: [PATCH] [FIR2IR] Get rid of all usages of IrSymbol.owner from Fir2IrLazyPropertyAccessor ^KT-60924 --- .../jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt index af1fa9b20c2..f1c3654b0ac 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyPropertyAccessor.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.ir.declarations.IrValueParameter import org.jetbrains.kotlin.ir.declarations.lazy.lazyVar import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol -import org.jetbrains.kotlin.ir.symbols.IrSymbolInternals import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.util.isFacadeClass import org.jetbrains.kotlin.name.Name @@ -114,9 +113,9 @@ class Fir2IrLazyPropertyAccessor( firParentProperty.generateOverriddenAccessorSymbols(firParentClass, !isSetter) } - @OptIn(IrSymbolInternals::class) override val initialSignatureFunction: IrFunction? by lazy { - (fir as? FirSyntheticPropertyAccessor)?.delegate?.let { declarationStorage.getIrFunctionSymbol(it.symbol).owner } + val originalFirFunction = (fir as? FirSyntheticPropertyAccessor)?.delegate ?: return@lazy null + declarationStorage.getOrCreateIrFunction(originalFirFunction, parent) } override val containerSource: DeserializedContainerSource?