From 0f4f3f2429e5feb2850d77d369ae7c55fc919a08 Mon Sep 17 00:00:00 2001 From: pyos Date: Thu, 21 Nov 2019 13:13:35 +0100 Subject: [PATCH] FIR: set correspondingPropertySymbol of backing fields --- .../src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt | 3 ++- compiler/testData/codegen/box/properties/const/anotherFile.kt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 7d540fb88a4..e50593c72fb 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -516,7 +516,8 @@ class Fir2IrVisitor( }.setParentByParentStack().withParent { declarationStorage.enterScope(descriptor) val initializerExpression = firInitializerExpression?.toIrExpression() - this.initializer = initializerExpression?.let { IrExpressionBodyImpl(it) } + initializer = initializerExpression?.let { IrExpressionBodyImpl(it) } + correspondingPropertySymbol = this@createBackingField.symbol declarationStorage.leaveScope(descriptor) } } diff --git a/compiler/testData/codegen/box/properties/const/anotherFile.kt b/compiler/testData/codegen/box/properties/const/anotherFile.kt index 810de6d8ade..a46dfa72191 100644 --- a/compiler/testData/codegen/box/properties/const/anotherFile.kt +++ b/compiler/testData/codegen/box/properties/const/anotherFile.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // FILE: 1.kt // File names are important! This file should come before the other one // in a lexicographic order.