[Commonizer] Remove references to CallableMemberDescriptor

In FIR, we're fine using `Modality`, `Visibility`, and `ClassKind`, but
this one will probably be dropped together with K1.

Author: lunakoly

native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunction.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.commonizer.cir
 
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 
@@ -20,7 +19,7 @@ data class CirFunction(
     override var hasStableParameterNames: Boolean,
     override val extensionReceiver: CirExtensionReceiver?,
     override val returnType: CirType,
-    override val kind: CallableMemberDescriptor.Kind,
+    override val kind: CirFunctionOrProperty.Kind,
     val modifiers: CirFunctionModifiers
 ) : CirFunctionOrProperty, CirCallableMemberWithParameters {
     override fun withContainingClass(containingClass: CirContainingClass): CirFunction {

native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunctionOrProperty.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.commonizer.cir
 
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
@@ -21,7 +20,14 @@ interface CirFunctionOrProperty :
 
     val extensionReceiver: CirExtensionReceiver?
     val returnType: CirType
-    val kind: CallableMemberDescriptor.Kind
+    val kind: Kind
+
+    enum class Kind {
+        DECLARATION,
+        FAKE_OVERRIDE,
+        DELEGATION,
+        SYNTHESIZED,
+    }
 
     fun isVirtual(): Boolean =
         visibility != Visibilities.Private

native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.commonizer.cir
 
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 
@@ -18,7 +17,7 @@ data class CirProperty(
     override val containingClass: CirContainingClass?,
     override val extensionReceiver: CirExtensionReceiver?,
     override val returnType: CirType,
-    override val kind: CallableMemberDescriptor.Kind,
+    override val kind: CirFunctionOrProperty.Kind,
     val isVar: Boolean,
     val isLateInit: Boolean,
     val isConst: Boolean,

native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt

@@ -9,9 +9,8 @@ import org.jetbrains.kotlin.commonizer.CommonizerSettings
 import org.jetbrains.kotlin.commonizer.cir.*
 import org.jetbrains.kotlin.commonizer.mergedtree.CirKnownClassifiers
 import org.jetbrains.kotlin.commonizer.utils.singleDistinctValueOrNull
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED
+import org.jetbrains.kotlin.commonizer.cir.CirFunctionOrProperty.Kind.DELEGATION
+import org.jetbrains.kotlin.commonizer.cir.CirFunctionOrProperty.Kind.SYNTHESIZED
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 
@@ -25,7 +24,7 @@ class FunctionOrPropertyBaseCommonizer(
 
     data class FunctionOrProperty(
         val name: CirName,
-        val kind: CallableMemberDescriptor.Kind,
+        val kind: CirFunctionOrProperty.Kind,
         val modality: Modality,
         val visibility: Visibility,
         val extensionReceiver: CirExtensionReceiver?,

native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt

@@ -142,12 +142,12 @@ object CirDeserializers {
     }
 
     @Suppress("NOTHING_TO_INLINE")
-    private inline fun callableKind(memberKind: MemberKind): CallableMemberDescriptor.Kind =
+    private inline fun callableKind(memberKind: MemberKind): CirFunctionOrProperty.Kind =
         when (memberKind) {
-            MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
-            MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
-            MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION
-            MemberKind.SYNTHESIZED -> CallableMemberDescriptor.Kind.SYNTHESIZED
+            MemberKind.DECLARATION -> CirFunctionOrProperty.Kind.DECLARATION
+            MemberKind.FAKE_OVERRIDE -> CirFunctionOrProperty.Kind.FAKE_OVERRIDE
+            MemberKind.DELEGATION -> CirFunctionOrProperty.Kind.DELEGATION
+            MemberKind.SYNTHESIZED -> CirFunctionOrProperty.Kind.SYNTHESIZED
         }
 
     fun function(name: CirName, source: KmFunction, containingClass: CirContainingClass?, typeResolver: CirTypeResolver): CirFunction =

native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirSerializers.kt

@@ -182,7 +182,7 @@ internal fun CirFunction.serializeFunction(
 ): KmFunction = KmFunction(
     name = name.name
 ).also { function ->
-    function.modifiersFrom(this, isExpect = context.isCommon && kind != CallableMemberDescriptor.Kind.SYNTHESIZED)
+    function.modifiersFrom(this, isExpect = context.isCommon && kind != CirFunctionOrProperty.Kind.SYNTHESIZED)
     annotations.mapTo(function.annotations) { it.serializeAnnotation() }
     typeParameters.serializeTypeParameters(context, output = function.typeParameters)
     valueParameters.mapTo(function.valueParameters) { it.serializeValueParameter(context) }

native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/flags.kt

@@ -7,7 +7,6 @@
 package org.jetbrains.kotlin.commonizer.metadata
 
 import org.jetbrains.kotlin.commonizer.cir.*
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
@@ -120,12 +119,12 @@ private inline val CirHasModality.kmModality: KmModality
         Modality.SEALED -> KmModality.SEALED
     }
 
-private inline val CallableMemberDescriptor.Kind.kmMemberKind: MemberKind
+private inline val CirFunctionOrProperty.Kind.kmMemberKind: MemberKind
     get() = when (this) {
-        CallableMemberDescriptor.Kind.DECLARATION -> MemberKind.DECLARATION
-        CallableMemberDescriptor.Kind.FAKE_OVERRIDE -> MemberKind.FAKE_OVERRIDE
-        CallableMemberDescriptor.Kind.DELEGATION -> MemberKind.DELEGATION
-        CallableMemberDescriptor.Kind.SYNTHESIZED -> MemberKind.SYNTHESIZED
+        CirFunctionOrProperty.Kind.DECLARATION -> MemberKind.DECLARATION
+        CirFunctionOrProperty.Kind.FAKE_OVERRIDE -> MemberKind.FAKE_OVERRIDE
+        CirFunctionOrProperty.Kind.DELEGATION -> MemberKind.DELEGATION
+        CirFunctionOrProperty.Kind.SYNTHESIZED -> MemberKind.SYNTHESIZED
     }
 
 private inline val CirClass.kmClassKind: KmClassKind