From 7757fd312b003c9c65b952e0d7767c414c7f98ff Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Thu, 9 Dec 2021 23:00:26 -0800 Subject: [PATCH] FIR LC: make fields in objects static --- .../light/classes/symbol/classes/FirLightClassForSymbol.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt index 9a2cc515d3b..9f028d0ce87 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt @@ -272,12 +272,10 @@ internal open class FirLightClassForSymbol( fun addPropertyBackingField(propertySymbol: KtPropertySymbol) { val isJvmField = propertySymbol.hasJvmFieldAnnotation() - val isJvmStatic = propertySymbol.hasJvmStaticAnnotation() val isLateInit = (propertySymbol as? KtKotlinPropertySymbol)?.isLateInit == true - val forceStatic = classOrObjectSymbol.isObject && - (propertySymbol is KtKotlinPropertySymbol && propertySymbol.isConst || isJvmStatic || isJvmField) - val takePropertyVisibility = !classOrObjectSymbol.isCompanionObject && (isLateInit || isJvmField || forceStatic) + val forceStatic = classOrObjectSymbol.isObject + val takePropertyVisibility = !classOrObjectSymbol.isCompanionObject && (isLateInit || isJvmField) createField( declaration = propertySymbol,