Support multiple version requirements on single element

compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.builtins.transformSuspendFunctionToRuntimeFunctionTy
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.VersionRequirement
@@ -141,10 +142,7 @@ class DescriptorSerializer private constructor(
             builder.typeTable = typeTableProto
         }
 
-        val requirement = serializeVersionRequirement(classDescriptor)
-        if (requirement != null) {
-            builder.versionRequirement = requirement
-        }
+        builder.addAllVersionRequirement(serializeVersionRequirements(classDescriptor))
 
         extension.serializeClass(classDescriptor, builder, versionRequirementTable)
 
@@ -235,11 +233,10 @@ class DescriptorSerializer private constructor(
             }
         }
 
-        val requirement = serializeVersionRequirement(descriptor)
-        if (requirement != null) {
-            builder.versionRequirement = requirement
-        } else if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
-            builder.versionRequirement = writeVersionRequirementDependingOnCoroutinesVersion()
+        builder.addAllVersionRequirement(serializeVersionRequirements(descriptor))
+
+        if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
+            builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion())
         }
 
         extension.serializeProperty(descriptor, builder, versionRequirementTable)
@@ -305,11 +302,10 @@ class DescriptorSerializer private constructor(
             }
         }
 
-        val requirement = serializeVersionRequirement(descriptor)
-        if (requirement != null) {
-            builder.versionRequirement = requirement
-        } else if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
-            builder.versionRequirement = writeVersionRequirementDependingOnCoroutinesVersion()
+        builder.addAllVersionRequirement(serializeVersionRequirements(descriptor))
+
+        if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
+            builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion())
         }
 
         contractSerializer.serializeContractOfFunctionIfAny(descriptor, builder, this)
@@ -335,11 +331,10 @@ class DescriptorSerializer private constructor(
             builder.addValueParameter(local.valueParameter(valueParameterDescriptor))
         }
 
-        val requirement = serializeVersionRequirement(descriptor)
-        if (requirement != null) {
-            builder.versionRequirement = requirement
-        } else if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
-            builder.versionRequirement = writeVersionRequirementDependingOnCoroutinesVersion()
+        builder.addAllVersionRequirement(serializeVersionRequirements(descriptor))
+
+        if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
+            builder.addVersionRequirement(writeVersionRequirementDependingOnCoroutinesVersion())
         }
 
         extension.serializeConstructor(descriptor, builder)
@@ -392,10 +387,7 @@ class DescriptorSerializer private constructor(
             builder.setExpandedType(local.type(expandedType))
         }
 
-        val requirement = serializeVersionRequirement(descriptor)
-        if (requirement != null) {
-            builder.versionRequirement = requirement
-        }
+        builder.addAllVersionRequirement(serializeVersionRequirements(descriptor))
 
         for (annotation in descriptor.nonSourceAnnotations) {
             builder.addAnnotation(extension.annotationSerializer.serializeAnnotation(annotation))
@@ -633,9 +625,13 @@ class DescriptorSerializer private constructor(
         return writeVersionRequirement(major, minor, patch, versionKind, versionRequirementTable)
     }
 
-    // Returns index into versionRequirementTable, or null if there's no @RequireKotlin on the descriptor
-    private fun serializeVersionRequirement(descriptor: DeclarationDescriptor): Int? {
-        val annotation = descriptor.annotations.findAnnotation(RequireKotlinNames.FQ_NAME) ?: return null
+    // Returns a list of indices into versionRequirementTable, or empty list if there's no @RequireKotlin on the descriptor
+    private fun serializeVersionRequirements(descriptor: DeclarationDescriptor): List<Int> =
+        descriptor.annotations
+            .filter { it.fqName == RequireKotlinNames.FQ_NAME }
+            .mapNotNull(::serializeVersionRequirementFromRequireKotlin)
+
+    private fun serializeVersionRequirementFromRequireKotlin(annotation: AnnotationDescriptor): Int? {
         val args = annotation.allValueArguments
 
         val versionString = (args[RequireKotlinNames.VERSION] as? StringValue)?.value ?: return null