[Commonizer] Refactor/simplify marker interfaces

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt

@@ -5,12 +5,10 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
 
-interface CirAnnotation {
+interface CirAnnotation : CirHasFqName {
-    val fqName: FqName
     val constantValueArguments: Map<Name, ConstantValue<*>>
     val annotationValueArguments: Map<Name, CirAnnotation>
 }

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt

@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.name.FqName
 
-interface CirClass : CirClassifier, CirDeclarationWithModality {
+interface CirClass : CirClassifier, CirHasModality {
     val kind: ClassKind
     var companion: FqName? // null means no companion object
     val isCompanion: Boolean

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassConstructor.kt

@@ -8,9 +8,10 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 
 interface CirClassConstructor :
-    CirAnnotatedDeclaration,
+    CirDeclaration,
-    CirDeclarationWithTypeParameters,
+    CirHasAnnotations,
-    CirDeclarationWithVisibility,
+    CirHasTypeParameters,
+    CirHasVisibility,
     CirMaybeCallableMemberOfClass,
     CirCallableMemberWithParameters {
 

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifier.kt

@@ -6,7 +6,8 @@
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
 interface CirClassifier :
-    CirAnnotatedDeclaration,
+    CirDeclaration,
-    CirNamedDeclaration,
+    CirHasAnnotations,
-    CirDeclarationWithTypeParameters,
+    CirHasName,
-    CirDeclarationWithVisibility
+    CirHasTypeParameters,
+    CirHasVisibility

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirContainingClassDetails.kt

@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.descriptors.Modality
 // TODO: inline?
 data class CirContainingClassDetails(
     val kind: ClassKind,
-    val modality: Modality,
+    override val modality: Modality,
     val isData: Boolean
-) {
+) : CirHasModality {
     companion object {
         val DOES_NOT_MATTER = CirContainingClassDetails(
             kind = ClassKind.CLASS,

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt

@@ -23,30 +23,31 @@ import org.jetbrains.kotlin.name.Name
  */
 interface CirDeclaration
 
-interface CirAnnotatedDeclaration : CirDeclaration {
+interface CirHasAnnotations {
     val annotations: List<CirAnnotation>
 }
 
-interface CirNamedDeclaration : CirDeclaration {
+interface CirHasName {
     val name: Name
 }
 
-// TODO: merge with [CirDeclarationWithVisibility]
+interface CirHasFqName {
+    val fqName: FqName
+}
+
 interface CirHasVisibility {
     val visibility: Visibility
 }
 
-interface CirDeclarationWithVisibility : CirDeclaration, CirHasVisibility
+interface CirHasModality {
-
-interface CirDeclarationWithModality : CirDeclaration {
     val modality: Modality
 }
 
-interface CirMaybeCallableMemberOfClass : CirDeclaration {
+interface CirMaybeCallableMemberOfClass {
     val containingClassDetails: CirContainingClassDetails? // null assumes no containing class
 }
 
-interface CirDeclarationWithTypeParameters : CirDeclaration {
+interface CirHasTypeParameters {
     val typeParameters: List<CirTypeParameter>
 }
 

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirExtensionReceiver.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-interface CirExtensionReceiver {
+interface CirExtensionReceiver : CirHasAnnotations {
-    val annotations: List<CirAnnotation>
     val type: CirType
 }

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

@@ -11,11 +11,12 @@ import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 
 interface CirFunctionOrProperty :
-    CirAnnotatedDeclaration,
+    CirDeclaration,
-    CirNamedDeclaration,
+    CirHasAnnotations,
-    CirDeclarationWithTypeParameters,
+    CirHasName,
-    CirDeclarationWithVisibility,
+    CirHasTypeParameters,
-    CirDeclarationWithModality,
+    CirHasVisibility,
+    CirHasModality,
     CirMaybeCallableMemberOfClass {
 
     val isExternal: Boolean

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirModule.kt

@@ -5,4 +5,4 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-interface CirModule : CirNamedDeclaration
+interface CirModule : CirDeclaration, CirHasName

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt

@@ -5,8 +5,4 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.name.FqName
+interface CirPackage : CirDeclaration, CirHasFqName
-
-interface CirPackage : CirDeclaration {
-    val fqName: FqName
-}

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertyAccessor.kt

@@ -5,8 +5,7 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-interface CirPropertyAccessor {
+interface CirPropertyAccessor : CirHasAnnotations {
-    val annotations: List<CirAnnotation>
     val isDefault: Boolean
     val isExternal: Boolean
     val isInline: Boolean

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertySetter.kt

@@ -5,6 +5,6 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-interface CirPropertySetter : CirPropertyAccessor, CirDeclarationWithVisibility {
+interface CirPropertySetter : CirDeclaration, CirPropertyAccessor, CirHasVisibility {
     val parameterAnnotations: List<CirAnnotation>
 }

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt

@@ -5,11 +5,9 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleTypeKind.CLASS
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirSimpleTypeKind.TYPE_ALIAS
 import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirTypeFactory
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.types.AbbreviatedType
 import org.jetbrains.kotlin.types.Variance
 
@@ -28,9 +26,8 @@ sealed class CirType {
  *
  * Note: Annotations at simple types are not preserved. After commonization all annotations assigned to types will be lost.
  */
-abstract class CirSimpleType : CirType(), CirHasVisibility {
+abstract class CirSimpleType : CirType(), CirHasVisibility, CirHasFqName {
     abstract val kind: CirSimpleTypeKind
-    abstract val fqName: FqName
     abstract val arguments: List<CirTypeProjection>
     abstract val isMarkedNullable: Boolean
     abstract val isDefinitelyNotNullType: Boolean

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeParameter.kt

@@ -5,12 +5,9 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
 
-interface CirTypeParameter {
+interface CirTypeParameter : CirHasAnnotations, CirHasName {
-    val annotations: List<CirAnnotation>
-    val name: Name
     val isReified: Boolean
     val variance: Variance
     val upperBounds: List<CirType>

native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirValueParameter.kt

@@ -5,11 +5,7 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir
 
-import org.jetbrains.kotlin.name.Name
+interface CirValueParameter : CirHasAnnotations, CirHasName {
-
-interface CirValueParameter {
-    val annotations: List<CirAnnotation>
-    val name: Name
     val returnType: CirType
     val varargElementType: CirType?
     val declaresDefaultValue: Boolean