Kotlinp: do not use hasAnnotations on Km declarations

 #KT-75290

Author: udalov

libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt

@@ -71,7 +71,7 @@ class KlibKotlinp(
         clazz.klibEnumEntries.forEach { enumEntry ->
             appendLine()
             appendSignature { enumEntrySignature(enumEntry) }
-            appendAnnotations(hasAnnotations = null, enumEntry.annotations)
+            appendAnnotations(enumEntry.annotations)
             appendLine(enumEntry.name, ",")
         }
     }

libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/Kotlinp.kt

@@ -5,8 +5,8 @@
 
 package org.jetbrains.kotlin.kotlinp
 
-import kotlin.metadata.*
 import kotlin.contracts.ExperimentalContracts
+import kotlin.metadata.*
 
 abstract class Kotlinp(protected val settings: Settings) {
     fun renderAnnotation(annotation: KmAnnotation, printer: Printer): Unit = with(printer) {
@@ -64,13 +64,11 @@ abstract class Kotlinp(protected val settings: Settings) {
         }
     }
 
-    protected fun Printer.appendAnnotations(hasAnnotations: Boolean?, annotations: List<KmAnnotation>, onePerLine: Boolean = true) {
-        if (hasAnnotations != false) {
-            annotations.forEach { annotation ->
-                append("@")
-                renderAnnotation(annotation, this)
-                if (onePerLine) appendLine() else append(" ")
-            }
+    protected fun Printer.appendAnnotations(annotations: List<KmAnnotation>, onePerLine: Boolean = true) {
+        annotations.forEach { annotation ->
+            append("@")
+            renderAnnotation(annotation, this)
+            if (onePerLine) appendLine() else append(" ")
         }
     }
 
@@ -79,7 +77,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendOrigin(clazz)
         appendVersionRequirements(clazz.versionRequirements)
         appendSignatures(clazz)
-        appendAnnotations(clazz.hasAnnotations, getAnnotations(clazz))
+        appendAnnotations(getAnnotations(clazz))
         appendContextReceiverTypes(clazz.contextReceiverTypes)
         append(VISIBILITY_MAP[clazz.visibility])
         append(MODALITY_MAP[clazz.modality])
@@ -139,7 +137,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendLine()
         appendVersionRequirements(constructor.versionRequirements)
         appendSignatures(constructor)
-        appendAnnotations(constructor.hasAnnotations, getAnnotations(constructor))
+        appendAnnotations(getAnnotations(constructor))
         renderConstructorModifiers(constructor, printer)
         append("constructor")
         appendValueParameters(constructor.valueParameters)
@@ -160,7 +158,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendOrigin(function)
         appendVersionRequirements(function.versionRequirements)
         appendSignatures(function)
-        appendAnnotations(function.hasAnnotations, getAnnotations(function))
+        appendAnnotations(getAnnotations(function))
         appendContextReceiverTypes(function.contextReceiverTypes)
         renderFunctionModifiers(function, printer)
         append("fun ")
@@ -294,7 +292,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendVersionRequirements(property.versionRequirements)
         appendSignatures(property)
         appendCustomAttributes(property)
-        appendAnnotations(property.hasAnnotations, getAnnotations(property))
+        appendAnnotations(getAnnotations(property))
         appendContextReceiverTypes(property.contextReceiverTypes)
         renderPropertyModifiers(property, printer)
         append(if (property.isVar) "var " else "val ")
@@ -308,12 +306,12 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendLine()
         withIndent {
             appendGetterSignatures(property)
-            appendAnnotations(property.getter.hasAnnotations, getGetterAnnotations(property))
+            appendAnnotations(getGetterAnnotations(property))
             renderPropertyAccessorModifiers(property.getter, printer)
             appendLine("get")
             property.setter?.let { setter ->
                 appendSetterSignatures(property)
-                appendAnnotations(setter.hasAnnotations, getSetterAnnotations(property))
+                appendAnnotations(getSetterAnnotations(property))
                 renderPropertyAccessorModifiers(setter, printer)
                 append("set")
                 property.setterParameter?.let {
@@ -351,7 +349,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         appendLine()
         appendVersionRequirements(typeAlias.versionRequirements)
         appendSignatures(typeAlias)
-        appendAnnotations(typeAlias.hasAnnotations, typeAlias.annotations)
+        appendAnnotations(typeAlias.annotations)
         append(VISIBILITY_MAP[typeAlias.visibility], "typealias ", typeAlias.name)
         appendTypeParameters(typeAlias.typeParameters)
         append(" = ").appendType(typeAlias.underlyingType)
@@ -361,7 +359,7 @@ abstract class Kotlinp(protected val settings: Settings) {
 
     fun renderTypeParameter(typeParameter: KmTypeParameter, printer: Printer): Unit = with(printer) {
         appendFlags(typeParameter.isReified to "reified")
-        appendAnnotations(hasAnnotations = null, getAnnotations(typeParameter), onePerLine = false)
+        appendAnnotations(getAnnotations(typeParameter), onePerLine = false)
         if (typeParameter.variance != KmVariance.INVARIANT) {
             append(typeParameter.variance.name.lowercase()).append(" ")
         }
@@ -388,7 +386,7 @@ abstract class Kotlinp(protected val settings: Settings) {
         val platformTypeUpperBound = type.flexibleTypeUpperBound?.let { renderFlexibleTypeUpperBound(it) }
 
         printer += printString {
-            appendAnnotations(hasAnnotations = null, getAnnotations(type), onePerLine = false)
+            appendAnnotations(getAnnotations(type), onePerLine = false)
             appendFlags(
                 isRaw(type) to "/* raw */",
                 type.isSuspend to "suspend"
@@ -442,7 +440,7 @@ abstract class Kotlinp(protected val settings: Settings) {
     }
 
     fun renderValueParameter(valueParameter: KmValueParameter, printer: Printer): Unit = with(printer) {
-        appendAnnotations(valueParameter.hasAnnotations, getAnnotations(valueParameter), onePerLine = false)
+        appendAnnotations(getAnnotations(valueParameter), onePerLine = false)
         appendFlags(
             valueParameter.isCrossinline to "crossinline",
             valueParameter.isNoinline to "noinline"

native/native.tests/testData/CInterop/experimental/cases/enum/contents.gold.txt

@@ -71,8 +71,10 @@ library {
       public final const val FOUR: kotlin/UInt /* = dependency/E2^ */ /* = 4u */
         public final get
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias E2 = kotlin/UInt /* = kotlin/UInt */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias E2Var = kotlinx/cinterop/UIntVarOf<dependency/E2^> /* = kotlinx/cinterop/UIntVarOf<kotlin/UInt /* = dependency/E2^ */> */
     }
   }

native/native.tests/testData/CInterop/experimental/cases/objctypedef/contents.gold.txt

@@ -33,12 +33,16 @@ library {
 
     package {
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyClassRef = dependency/MyClass? /* = dependency/MyClass? */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyClassRefVar = kotlinx/cinterop/ObjCObjectVar<dependency/MyClassRef^> /* = kotlinx/cinterop/ObjCObjectVar<dependency/MyClass? /* = dependency/MyClassRef^ */> */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyId = kotlin/Any? /* = kotlin/Any? */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyIdVar = kotlinx/cinterop/ObjCObjectVar<dependency/MyId^> /* = kotlinx/cinterop/ObjCObjectVar<kotlin/Any? /* = dependency/MyId^ */> */
     }
   }

native/native.tests/testData/CInterop/experimental/cases/typedef/contents.gold.txt

@@ -27,16 +27,22 @@ library {
 
     package {
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyInt = kotlin/Int /* = kotlin/Int */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyIntVar = kotlinx/cinterop/IntVarOf<dependency/MyInt^> /* = kotlinx/cinterop/IntVarOf<kotlin/Int /* = dependency/MyInt^ */> */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyPointer = kotlinx/cinterop/COpaquePointer^ /* = kotlinx/cinterop/CPointer<out kotlinx/cinterop/CPointed> /* = kotlinx/cinterop/COpaquePointer^ */ */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyPointerVar = kotlinx/cinterop/CPointerVarOf<dependency/MyPointer^> /* = kotlinx/cinterop/CPointerVarOf<kotlinx/cinterop/CPointer<out kotlinx/cinterop/CPointed> /* = dependency/MyPointer^ */> */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyS = cnames/structs/S /* = cnames/structs/S */
 
+      @kotlinx/cinterop/ExperimentalForeignApi
       public typealias MyT = dependency/T /* = dependency/T */
     }
   }