diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt index 3aaa6e7fcb5..6d3179d6be5 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt @@ -9,87 +9,27 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility -interface CirProperty : CirFunctionOrProperty, CirLiftedUpDeclaration { - val isExternal: Boolean - val isVar: Boolean - val isLateInit: Boolean - val isConst: Boolean - val isDelegate: Boolean - val getter: CirPropertyGetter? - val setter: CirPropertySetter? - val backingFieldAnnotations: List - val delegateFieldAnnotations: List - val compileTimeInitializer: CirConstantValue - - override fun withContainingClass(containingClass: CirContainingClass): CirProperty - - companion object { - @Suppress("NOTHING_TO_INLINE") - inline fun create( - annotations: List, - name: CirName, - typeParameters: List, - visibility: Visibility, - modality: Modality, - containingClass: CirContainingClass?, - isExternal: Boolean, - extensionReceiver: CirExtensionReceiver?, - returnType: CirType, - kind: CallableMemberDescriptor.Kind, - isVar: Boolean, - isLateInit: Boolean, - isConst: Boolean, - isDelegate: Boolean, - getter: CirPropertyGetter?, - setter: CirPropertySetter?, - backingFieldAnnotations: List, - delegateFieldAnnotations: List, - compileTimeInitializer: CirConstantValue - ): CirProperty = CirPropertyImpl( - annotations = annotations, - name = name, - typeParameters = typeParameters, - visibility = visibility, - modality = modality, - containingClass = containingClass, - isExternal = isExternal, - extensionReceiver = extensionReceiver, - returnType = returnType, - kind = kind, - isVar = isVar, - isLateInit = isLateInit, - isConst = isConst, - isDelegate = isDelegate, - getter = getter, - setter = setter, - backingFieldAnnotations = backingFieldAnnotations, - delegateFieldAnnotations = delegateFieldAnnotations, - compileTimeInitializer = compileTimeInitializer - ) - } -} - -data class CirPropertyImpl( +data class CirProperty( override val annotations: List, override val name: CirName, override val typeParameters: List, override val visibility: Visibility, override val modality: Modality, override val containingClass: CirContainingClass?, - override val isExternal: Boolean, + val isExternal: Boolean, override val extensionReceiver: CirExtensionReceiver?, override val returnType: CirType, override val kind: CallableMemberDescriptor.Kind, - override val isVar: Boolean, - override val isLateInit: Boolean, - override val isConst: Boolean, - override val isDelegate: Boolean, - override val getter: CirPropertyGetter?, - override val setter: CirPropertySetter?, - override val backingFieldAnnotations: List, - override val delegateFieldAnnotations: List, - override val compileTimeInitializer: CirConstantValue -) : CirProperty { + val isVar: Boolean, + val isLateInit: Boolean, + val isConst: Boolean, + val isDelegate: Boolean, + val getter: CirPropertyGetter?, + val setter: CirPropertySetter?, + val backingFieldAnnotations: List, + val delegateFieldAnnotations: List, + val compileTimeInitializer: CirConstantValue +) : CirFunctionOrProperty, CirLiftedUpDeclaration { // const property in "common" fragment is already lifted up override val isLiftedUp get() = isConst diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt index 6f1fbb889b8..38e7fc273d3 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt @@ -22,7 +22,7 @@ class PropertyCommonizer(classifiers: CirKnownClassifiers) : AbstractFunctionOrP val constCommonizationState = constCommonizationState val constCompileTimeInitializer = (constCommonizationState as? ConstSameValue)?.compileTimeInitializer - return CirProperty.create( + return CirProperty( annotations = emptyList(), name = name, typeParameters = typeParameters.result, diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt index ee95516f058..d21d8c59c37 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt @@ -97,7 +97,7 @@ object CirDeserializers { ) } else CirConstantValue.NullValue - return CirProperty.create( + return CirProperty( annotations = annotations(source.flags, typeResolver, source::annotations), name = name, typeParameters = source.typeParameters.compactMap { typeParameter(it, typeResolver) },