kotlin-metadata-jvm: move annotations reads/writes to extensions

To avoid reading/writing annotations to the new fields in case of klib &
builtins, before it is supported in the compiler (KT-64237, KT-75010).

Author: udalov

libraries/kotlinx-metadata/jvm/src/kotlin/metadata/jvm/internal/JvmMetadataExtensions.kt

@@ -5,15 +5,14 @@
 
 package kotlin.metadata.jvm.internal
 
-import kotlin.metadata.*
-import kotlin.metadata.internal.*
-import kotlin.metadata.internal.common.*
-import kotlin.metadata.internal.extensions.*
-import kotlin.metadata.jvm.*
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
+import kotlin.metadata.*
+import kotlin.metadata.internal.*
+import kotlin.metadata.internal.common.KmModuleFragment
+import kotlin.metadata.internal.extensions.*
 import kotlin.metadata.jvm.JvmMemberSignature
 import kotlin.metadata.jvm.JvmMethodSignature
 import kotlin.metadata.jvm.wrapAsPublic
@@ -22,6 +21,8 @@ internal class JvmMetadataExtensions : MetadataExtensions {
     override fun readClassExtensions(kmClass: KmClass, proto: ProtoBuf.Class, c: ReadContext) {
         val ext = kmClass.jvm
 
+        proto.annotationList.mapTo(kmClass.annotations) { it.readAnnotation(c.strings) }
+
         val anonymousObjectOriginName = proto.getExtensionOrNull(JvmProtoBuf.anonymousObjectOriginName)
         if (anonymousObjectOriginName != null) {
             ext.anonymousObjectOriginName = c[anonymousObjectOriginName]
@@ -53,6 +54,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
 
     override fun readFunctionExtensions(kmFunction: KmFunction, proto: ProtoBuf.Function, c: ReadContext) {
         val ext = kmFunction.jvm
+        proto.annotationList.mapTo(kmFunction.annotations) { it.readAnnotation(c.strings) }
         ext.signature = JvmProtoBufUtil.getJvmMethodSignature(proto, c.strings, c.types)?.wrapAsPublic()
 
         val lambdaClassOriginName = proto.getExtensionOrNull(JvmProtoBuf.lambdaClassOriginName)
@@ -63,6 +65,13 @@ internal class JvmMetadataExtensions : MetadataExtensions {
 
     override fun readPropertyExtensions(kmProperty: KmProperty, proto: ProtoBuf.Property, c: ReadContext) {
         val ext = kmProperty.jvm
+
+        proto.annotationList.mapTo(kmProperty.annotations) { it.readAnnotation(c.strings) }
+        proto.getterAnnotationList.mapTo(kmProperty.getter.annotations) { it.readAnnotation(c.strings) }
+        kmProperty.setter?.let { setter ->
+            proto.setterAnnotationList.mapTo(setter.annotations) { it.readAnnotation(c.strings) }
+        }
+
         val fieldSignature = JvmProtoBufUtil.getJvmFieldSignature(proto, c.strings, c.types)
         val propertySignature = proto.getExtensionOrNull(JvmProtoBuf.propertySignature)
         val getterSignature =
@@ -85,6 +94,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
 
     override fun readConstructorExtensions(kmConstructor: KmConstructor, proto: ProtoBuf.Constructor, c: ReadContext) {
         val ext = kmConstructor.jvm
+        proto.annotationList.mapTo(kmConstructor.annotations) { it.readAnnotation(c.strings) }
         ext.signature = JvmProtoBufUtil.getJvmConstructorSignature(proto, c.strings, c.types)?.wrapAsPublic()
     }
 
@@ -105,10 +115,13 @@ internal class JvmMetadataExtensions : MetadataExtensions {
 
     override fun readTypeAliasExtensions(kmTypeAlias: KmTypeAlias, proto: ProtoBuf.TypeAlias, c: ReadContext) {}
 
-    override fun readValueParameterExtensions(kmValueParameter: KmValueParameter, proto: ProtoBuf.ValueParameter, c: ReadContext) {}
+    override fun readValueParameterExtensions(kmValueParameter: KmValueParameter, proto: ProtoBuf.ValueParameter, c: ReadContext) {
+        proto.annotationList.mapTo(kmValueParameter.annotations) { it.readAnnotation(c.strings) }
+    }
 
     override fun writeClassExtensions(kmClass: KmClass, proto: ProtoBuf.Class.Builder, c: WriteContext) =
         with(kmClass.jvm) {
+            proto.addAllAnnotation(kmClass.annotations.map { it.writeAnnotation(c.strings).build() })
             anonymousObjectOriginName?.let {
                 proto.setExtension(JvmProtoBuf.anonymousObjectOriginName, c[it])
             }
@@ -145,6 +158,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
         kmFunction: KmFunction, proto: ProtoBuf.Function.Builder, c: WriteContext,
     ) {
         with(kmFunction.jvm) {
+            proto.addAllAnnotation(kmFunction.annotations.map { it.writeAnnotation(c.strings).build() })
             signature?.let { proto.setExtension(JvmProtoBuf.methodSignature, it.toJvmMethodSignature(c)) }
             lambdaClassOriginName?.let { proto.setExtension(JvmProtoBuf.lambdaClassOriginName, c[it]) }
         }
@@ -153,6 +167,12 @@ internal class JvmMetadataExtensions : MetadataExtensions {
     override fun writePropertyExtensions(
         kmProperty: KmProperty, proto: ProtoBuf.Property.Builder, c: WriteContext,
     ) = with(kmProperty.jvm) {
+        proto.addAllAnnotation(kmProperty.annotations.map { it.writeAnnotation(c.strings).build() })
+        proto.addAllGetterAnnotation(kmProperty.getter.annotations.map { it.writeAnnotation(c.strings).build() })
+        kmProperty.setter?.let { setter ->
+            proto.addAllSetterAnnotation(setter.annotations.map { it.writeAnnotation(c.strings).build() })
+        }
+
         val composedSignature: JvmProtoBuf.JvmPropertySignature.Builder = JvmProtoBuf.JvmPropertySignature.newBuilder()
         var hasSignature = false
 
@@ -188,6 +208,7 @@ internal class JvmMetadataExtensions : MetadataExtensions {
     override fun writeConstructorExtensions(
         kmConstructor: KmConstructor, proto: ProtoBuf.Constructor.Builder, c: WriteContext,
     ): Unit = with(kmConstructor.jvm) {
+        proto.addAllAnnotation(kmConstructor.annotations.map { it.writeAnnotation(c.strings).build() })
         signature?.let { proto.setExtension(JvmProtoBuf.constructorSignature, it.toJvmMethodSignature(c)) }
     }
 
@@ -217,7 +238,9 @@ internal class JvmMetadataExtensions : MetadataExtensions {
         valueParameter: KmValueParameter,
         proto: ProtoBuf.ValueParameter.Builder,
         c: WriteContext,
-    ) = Unit
+    ) {
+        proto.addAllAnnotation(valueParameter.annotations.map { it.writeAnnotation(c.strings).build() })
+    }
 
     override fun createClassExtension(): KmClassExtension = JvmClassExtension()
 

libraries/kotlinx-metadata/src/kotlin/metadata/internal/Readers.kt

@@ -4,12 +4,12 @@
  */
 package kotlin.metadata.internal
 
-import kotlin.metadata.*
-import kotlin.metadata.internal.common.KmModuleFragment
-import kotlin.metadata.internal.extensions.MetadataExtensions
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.*
 import kotlin.contracts.ExperimentalContracts
+import kotlin.metadata.*
+import kotlin.metadata.internal.common.KmModuleFragment
+import kotlin.metadata.internal.extensions.MetadataExtensions
 import org.jetbrains.kotlin.metadata.deserialization.Flags as F
 
 /**
@@ -87,8 +87,6 @@ public fun ProtoBuf.Class.toKmClass(
     contextReceiverTypes(c.types).mapTo(v.contextReceiverTypes) { it.toKmType(c) }
     versionRequirementList.mapTo(v.versionRequirements) { readVersionRequirement(it, c) }
 
-    annotationList.mapTo(v.annotations) { it.readAnnotation(c.strings) }
-
     c.extensions.forEach { it.readClassExtensions(v, this, c) }
 
     return v
@@ -170,7 +168,6 @@ private fun ProtoBuf.Constructor.toKmConstructor(c: ReadContext): KmConstructor
     val v = KmConstructor(flags)
     valueParameterList.mapTo(v.valueParameters) { it.toKmValueParameter(c) }
     versionRequirementList.mapTo(v.versionRequirements) { readVersionRequirement(it, c) }
-    annotationList.mapTo(v.annotations) { it.readAnnotation(c.strings) }
 
     c.extensions.forEach { it.readConstructorExtensions(v, this, c) }
 
@@ -195,8 +192,6 @@ private fun ProtoBuf.Function.toKmFunction(outer: ReadContext): KmFunction {
 
     versionRequirementList.mapTo(v.versionRequirements) { readVersionRequirement(it, c) }
 
-    annotationList.mapTo(v.annotations) { it.readAnnotation(c.strings) }
-
     c.extensions.forEach { it.readFunctionExtensions(v, this, c) }
 
     return v
@@ -218,12 +213,6 @@ public fun ProtoBuf.Property.toKmProperty(outer: ReadContext): KmProperty {
 
     c.extensions.forEach { it.readPropertyExtensions(v, this, c) }
 
-    annotationList.mapTo(v.annotations) { it.readAnnotation(c.strings) }
-    getterAnnotationList.mapTo(v.getter.annotations) { it.readAnnotation(c.strings) }
-    v.setter?.let { setter ->
-        setterAnnotationList.mapTo(setter.annotations) { it.readAnnotation(c.strings) }
-    }
-
     return v
 }
 
@@ -252,8 +241,6 @@ private fun ProtoBuf.ValueParameter.toKmValueParameter(c: ReadContext): KmValueP
 
     c.extensions.forEach { it.readValueParameterExtensions(v, this, c) }
 
-    annotationList.mapTo(v.annotations) { it.readAnnotation(c.strings) }
-
     return v
 }
 

libraries/kotlinx-metadata/src/kotlin/metadata/internal/Writers.kt

@@ -4,14 +4,14 @@
  */
 package kotlin.metadata.internal
 
-import kotlin.metadata.*
-import kotlin.metadata.internal.common.KmModuleFragment
-import kotlin.metadata.internal.extensions.MetadataExtensions
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.VersionRequirement
 import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTable
 import org.jetbrains.kotlin.metadata.serialization.StringTable
 import kotlin.contracts.ExperimentalContracts
+import kotlin.metadata.*
+import kotlin.metadata.internal.common.KmModuleFragment
+import kotlin.metadata.internal.extensions.MetadataExtensions
 
 /**
  * Allows to populate [WriteContext] with additional data
@@ -116,7 +116,6 @@ private fun WriteContext.writeConstructor(kmConstructor: KmConstructor): ProtoBu
     if (kmConstructor.flags != ProtoBuf.Constructor.getDefaultInstance().flags) {
         t.flags = kmConstructor.flags
     }
-    t.addAllAnnotation(kmConstructor.annotations.map { it.writeAnnotation(strings).build() })
     return t
 }
 
@@ -140,7 +139,6 @@ private fun WriteContext.writeFunction(kmFunction: KmFunction): ProtoBuf.Functio
     if (kmFunction.flags != ProtoBuf.Function.getDefaultInstance().flags) {
         t.flags = kmFunction.flags
     }
-    t.addAllAnnotation(kmFunction.annotations.map { it.writeAnnotation(strings).build() })
     return t
 }
 
@@ -168,11 +166,8 @@ public fun WriteContext.writeProperty(kmProperty: KmProperty): ProtoBuf.Property
     // TODO: do not write getterFlags/setterFlags if not needed
     t.getterFlags = kmProperty.getter.flags
 
-    t.addAllAnnotation(kmProperty.annotations.map { it.writeAnnotation(strings).build() })
-    t.addAllGetterAnnotation(kmProperty.getter.annotations.map { it.writeAnnotation(strings).build() })
     kmProperty.setter?.let { setter ->
         t.setterFlags = setter.flags
-        t.addAllSetterAnnotation(setter.annotations.map { it.writeAnnotation(strings).build() })
     }
     return t
 }
@@ -188,7 +183,6 @@ private fun WriteContext.writeValueParameter(
         t.flags = kmValueParameter.flags
     }
     t.name = this[kmValueParameter.name]
-    t.addAllAnnotation(kmValueParameter.annotations.map { it.writeAnnotation(strings).build() })
     return t
 }
 
@@ -340,8 +334,6 @@ public open class ClassWriter(stringTable: StringTable, contextExtensions: List<
 
         t.addAllVersionRequirement(kmClass.versionRequirements.mapNotNull { c.writeVersionRequirement(it) })
 
-        t.addAllAnnotation(kmClass.annotations.map { it.writeAnnotation(c.strings).build() })
-
         c.extensions.forEach { it.writeClassExtensions(kmClass, t, c) }
 
         c.versionRequirements.serialize()?.let {