From 90f135dc3e8065870fdd63cac04d703e30eae681 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 12 Nov 2020 09:56:40 +0300 Subject: [PATCH] [FIR2IR] Use computeDeclarationOrigin in getIrPropertySymbol --- .../jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 46d100627dc..bccfe2d6fe9 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 @@ -1114,9 +1114,7 @@ class Fir2IrDeclarationStorage( signatureComposer.composeSignature(it) }?.let { return it.symbol } val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED - // TODO: Use computeDeclarationOrigin(firPropertySymbol, parentOrigin) - // Currently many backend tests are failing - val declarationOrigin = parentOrigin + val declarationOrigin = computeDeclarationOrigin(firPropertySymbol, parentOrigin, irParent) // TODO: package fragment members (?) val parent = irParent if (parent is Fir2IrLazyClass) {