FIR LC: make fields in objects static

This commit is contained in:
Jinseong Jeon
2021-12-09 23:00:26 -08:00
committed by Ilya Kirillov
parent 82c2f0c6fd
commit 7757fd312b
@@ -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,