Commonizer: do not use hasAnnotations on Km declarations

 #KT-75290

Author: udalov

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

@@ -6,28 +6,21 @@
 package org.jetbrains.kotlin.commonizer.metadata
 
 import kotlinx.metadata.klib.*
-import kotlinx.metadata.klib.annotations
-import kotlinx.metadata.klib.compileTimeValue
 import org.jetbrains.kotlin.commonizer.cir.*
 import org.jetbrains.kotlin.commonizer.utils.*
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.types.Variance
 import kotlin.metadata.*
 import kotlin.metadata.ClassKind as KmClassKind
 import kotlin.metadata.Modality as KmModality
 import kotlin.metadata.Visibility as KmVisibility
 
 object CirDeserializers {
-    private fun annotations(
-        hasAnnotations: Boolean,
-        typeResolver: CirTypeResolver,
-        annotations: () -> List<KmAnnotation>,
-    ): List<CirAnnotation> {
-        return if (!hasAnnotations)
-            emptyList()
-        else
-            annotations().compactMap { annotation(it, typeResolver) }
-    }
+    private fun annotations(annotations: List<KmAnnotation>, typeResolver: CirTypeResolver): List<CirAnnotation> =
+        annotations.compactMap { annotation(it, typeResolver) }
 
     private fun annotation(source: KmAnnotation, typeResolver: CirTypeResolver): CirAnnotation {
         val classId = CirEntityId.create(source.className)
@@ -75,7 +68,7 @@ object CirDeserializers {
     }
 
     private fun typeParameter(source: KmTypeParameter, typeResolver: CirTypeResolver): CirTypeParameter = CirTypeParameter(
-        annotations = annotations(true, typeResolver, source::annotations),
+        annotations = annotations(source.annotations, typeResolver),
         name = CirName.create(source.name),
         isReified = source.isReified,
         variance = variance(source.variance),
@@ -99,7 +92,7 @@ object CirDeserializers {
         } else CirConstantValue.NullValue
 
         return CirProperty(
-            annotations = annotations(source.hasAnnotations, typeResolver, source::klibAnnotations),
+            annotations = annotations(source.klibAnnotations, typeResolver),
             name = name,
             typeParameters = source.typeParameters.compactMap { typeParameter(it, typeResolver) },
             visibility = visibility(source.visibility),
@@ -122,7 +115,7 @@ object CirDeserializers {
 
     private fun propertyGetter(source: KmProperty, typeResolver: CirTypeResolver): CirPropertyGetter? {
         val isDefault = !source.getter.isNotDefault
-        val annotations = annotations(source.getter.hasAnnotations, typeResolver, source::klibGetterAnnotations)
+        val annotations = annotations(source.klibGetterAnnotations, typeResolver)
 
         if (isDefault && annotations.isEmpty())
             return CirPropertyGetter.DEFAULT_NO_ANNOTATIONS
@@ -138,10 +131,8 @@ object CirDeserializers {
         val setter = source.setter ?: return null
 
         return CirPropertySetter.createInterned(
-            annotations = annotations(source.setter?.hasAnnotations == true, typeResolver, source::klibSetterAnnotations),
-            parameterAnnotations = source.setterParameter?.let { setterParameter ->
-                annotations(setterParameter.hasAnnotations, typeResolver, setterParameter::klibAnnotations)
-            }.orEmpty(),
+            annotations = annotations(source.klibSetterAnnotations, typeResolver),
+            parameterAnnotations = source.setterParameter?.let { annotations(it.klibAnnotations, typeResolver) }.orEmpty(),
             visibility = visibility(setter.visibility),
             isDefault = !setter.isNotDefault,
             isInline = setter.isInline
@@ -159,7 +150,7 @@ object CirDeserializers {
 
     fun function(name: CirName, source: KmFunction, containingClass: CirContainingClass?, typeResolver: CirTypeResolver): CirFunction =
         CirFunction(
-            annotations = annotations(source.hasAnnotations, typeResolver, source::klibAnnotations),
+            annotations = annotations(source.klibAnnotations, typeResolver),
             name = name,
             typeParameters = source.typeParameters.compactMap { typeParameter(it, typeResolver) },
             visibility = visibility(source.visibility),
@@ -182,7 +173,7 @@ object CirDeserializers {
 
     private fun valueParameter(source: KmValueParameter, typeResolver: CirTypeResolver): CirValueParameter =
         CirValueParameter.createInterned(
-            annotations = annotations(source.hasAnnotations, typeResolver, source::klibAnnotations),
+            annotations = annotations(source.klibAnnotations, typeResolver),
             name = CirName.create(source.name),
             returnType = type(source.type, typeResolver),
             varargElementType = source.varargElementType?.let { type(it, typeResolver) },
@@ -242,7 +233,7 @@ object CirDeserializers {
     }
 
     fun clazz(name: CirName, source: KmClass, typeResolver: CirTypeResolver): CirClass = CirClass.create(
-        annotations = annotations(source.hasAnnotations, typeResolver, source::klibAnnotations),
+        annotations = annotations(source.klibAnnotations, typeResolver),
         name = name,
         typeParameters = source.typeParameters.compactMap { typeParameter(it, typeResolver) },
         supertypes = source.filteredSupertypes.compactMap { type(it, typeResolver) },
@@ -299,7 +290,7 @@ object CirDeserializers {
 
     fun constructor(source: KmConstructor, containingClass: CirContainingClass, typeResolver: CirTypeResolver): CirClassConstructor =
         CirClassConstructor.create(
-            annotations = annotations(source.hasAnnotations, typeResolver, source::klibAnnotations),
+            annotations = annotations(source.klibAnnotations, typeResolver),
             typeParameters = emptyList(), // TODO: nowhere to read constructor type parameters from
             visibility = visibility(source.visibility),
             containingClass = containingClass,
@@ -313,7 +304,7 @@ object CirDeserializers {
         val expandedType = underlyingType.unabbreviate()
 
         return CirTypeAlias.create(
-            annotations = annotations(source.hasAnnotations, typeResolver, source::annotations),
+            annotations = annotations(source.annotations, typeResolver),
             name = name,
             typeParameters = source.typeParameters.compactMap { typeParameter(it, typeResolver) },
             visibility = visibility(source.visibility),
@@ -410,4 +401,3 @@ object CirDeserializers {
             else -> error("Can't decode visibility $kmVisibility")
         }
 }
-