diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index bccfe2d6fe9..b6fb5fec23b 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -1089,19 +1089,6 @@ class Fir2IrDeclarationStorage( } } - private fun computeDeclarationOrigin( - symbol: FirCallableSymbol<*>, - parentOrigin: IrDeclarationOrigin, - irParent: IrDeclarationParent? - ): IrDeclarationOrigin { - return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride) - IrDeclarationOrigin.FAKE_OVERRIDE - else - parentOrigin - } - - private fun IrDeclarationParent?.isSourceClass() = this is IrClass && this !is Fir2IrLazyClass && this !is IrLazyClass - fun getIrPropertySymbol(firPropertySymbol: FirPropertySymbol): IrSymbol { val fir = firPropertySymbol.fir if (fir.isLocal) { @@ -1145,6 +1132,19 @@ class Fir2IrDeclarationStorage( }.symbol } + private fun computeDeclarationOrigin( + symbol: FirCallableSymbol<*>, + parentOrigin: IrDeclarationOrigin, + irParent: IrDeclarationParent? + ): IrDeclarationOrigin { + return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride) + IrDeclarationOrigin.FAKE_OVERRIDE + else + parentOrigin + } + + private fun IrDeclarationParent?.isSourceClass() = this is IrClass && this !is Fir2IrLazyClass && this !is IrLazyClass + fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol { val fir = firFieldSymbol.fir val irProperty = fieldCache[fir] ?: createIrField(fir).apply {