diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt index cf49919a7db..6d4f212c8b8 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPropertyFactory.kt @@ -51,8 +51,7 @@ object CirPropertyFactory { setter = source.setter?.let(CirPropertySetterFactory::create), backingFieldAnnotations = source.backingField?.annotations?.map(CirAnnotationFactory::create), delegateFieldAnnotations = source.delegateField?.annotations?.map(CirAnnotationFactory::create), - compileTimeInitializer = source.compileTimeInitializer, - isLiftedUp = false + compileTimeInitializer = source.compileTimeInitializer ) } @@ -76,8 +75,7 @@ object CirPropertyFactory { setter: CirPropertySetter?, backingFieldAnnotations: List?, delegateFieldAnnotations: List?, - compileTimeInitializer: ConstantValue<*>?, - isLiftedUp: Boolean + compileTimeInitializer: ConstantValue<*>? ): CirProperty { return CirPropertyImpl( annotations = annotations, @@ -98,8 +96,7 @@ object CirPropertyFactory { setter = setter, backingFieldAnnotations = backingFieldAnnotations, delegateFieldAnnotations = delegateFieldAnnotations, - compileTimeInitializer = compileTimeInitializer, - isLiftedUp = isLiftedUp + compileTimeInitializer = compileTimeInitializer ) } } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt index c7029886fa4..28fc2cd1b04 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPropertyImpl.kt @@ -31,6 +31,8 @@ data class CirPropertyImpl( override val setter: CirPropertySetter?, override val backingFieldAnnotations: List?, override val delegateFieldAnnotations: List?, - override val compileTimeInitializer: ConstantValue<*>?, - override val isLiftedUp: Boolean -) : CirProperty + override val compileTimeInitializer: ConstantValue<*>? +) : CirProperty { + // const property in "common" fragment is already lifted up + override val isLiftedUp get() = isConst +} diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt index 099c920518f..64b76cc4c83 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt @@ -39,8 +39,7 @@ class PropertyCommonizer(cache: CirClassifiersCache) : AbstractFunctionOrPropert setter = setter, backingFieldAnnotations = null, delegateFieldAnnotations = null, - compileTimeInitializer = constCompileTimeInitializer, - isLiftedUp = constCompileTimeInitializer != null + compileTimeInitializer = constCompileTimeInitializer ) }