[KLIB] Deduce the metadata version based on LV in KLIB-based backends

^KT-74417 Fixed

Author: francescoo22

compiler/frontend.common/src/org/jetbrains/kotlin/util/klibMetadataHelpers.kt

@@ -10,22 +10,11 @@ import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.config.metadataVersion
 import org.jetbrains.kotlin.metadata.deserialization.MetadataVersion
-import java.util.*
 
-val KLIB_LEGACY_METADATA_VERSION = MetadataVersion(1, 4, 1)
+private val KLIB_LEGACY_METADATA_VERSION = MetadataVersion(1, 4, 1)
 
-private val LANGUAGE_TO_KLIB_METADATA_VERSION = EnumMap<LanguageVersion, MetadataVersion>(LanguageVersion::class.java).apply {
-    LanguageVersion.entries.forEach { this[it] = KLIB_LEGACY_METADATA_VERSION }
-    // TODO KT-74417 Uncomment in version 2.3 to bump metadata version
-    this[LanguageVersion.KOTLIN_2_3] = KLIB_LEGACY_METADATA_VERSION // MetadataVersion(2, 3, 0)
-
-    check(size == LanguageVersion.entries.size) {
-        "Please add mappings from the missing LanguageVersion instances to the corresponding MetadataVersion " +
-                "in `LANGUAGE_TO_KLIB_METADATA_VERSION`"
-    }
-}
-
-fun LanguageVersion.toKlibMetadataVersion(): MetadataVersion = LANGUAGE_TO_KLIB_METADATA_VERSION.getValue(this)
+fun LanguageVersion.toKlibMetadataVersion(): MetadataVersion =
+    if (this < LanguageVersion.KOTLIN_2_3) KLIB_LEGACY_METADATA_VERSION else toJvmMetadataVersion()
 
 fun CompilerConfiguration.klibMetadataVersionOrDefault(
     languageVersion: LanguageVersion = languageVersionSettings.languageVersion

kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.konan.library.impl.KonanLibraryWriterImpl
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.library.*
 import org.jetbrains.kotlin.library.impl.BuiltInsPlatform
-import org.jetbrains.kotlin.util.KLIB_LEGACY_METADATA_VERSION
+import org.jetbrains.kotlin.metadata.deserialization.MetadataVersion
 import java.util.*
 
 fun createInteropLibrary(
@@ -32,8 +32,7 @@ fun createInteropLibrary(
     val version = KotlinLibraryVersioning(
             abiVersion = KotlinAbiVersion.CURRENT,
             compilerVersion = KotlinCompilerVersion.VERSION,
-            // TODO KT-74417 Consider using `MetadataVersion.INSTANCE` in version 2.3 here
-            metadataVersion = KLIB_LEGACY_METADATA_VERSION,
+            metadataVersion = MetadataVersion.INSTANCE,
     )
     val libFile = File(outputPath)
     val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir("klib")

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.fir.txt

@@ -10,7 +10,7 @@ library {
 
     public final annotation class test/Anno : kotlin/Annotation {
 
-      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+      public constructor(value: kotlin/String = "0", x: kotlin/Int = 0)
 
       public final val value: kotlin/String
         public final get

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v1.fir.txt

@@ -12,7 +12,7 @@ library {
     public final annotation class test/Anno : kotlin/Annotation {
 
       // signature: test/Anno.<init>|-2457917570611619111[0]
-      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+      public constructor(value: kotlin/String = "0", x: kotlin/Int = 0)
 
       // signature: test/Anno.value|1987073854177347439[0]
       public final val value: kotlin/String

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v2.fir.txt

@@ -12,7 +12,7 @@ library {
     public final annotation class test/Anno : kotlin/Annotation {
 
       // signature: test/Anno.<init>|<init>(kotlin.String;kotlin.Int){}[0]
-      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+      public constructor(value: kotlin/String = "0", x: kotlin/Int = 0)
 
       // signature: test/Anno.value|{}value[0]
       public final val value: kotlin/String