diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataUtils.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataUtils.kt index 6dbc9232dc0..33aa655ecba 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataUtils.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataUtils.kt @@ -22,7 +22,6 @@ fun buildKotlinMetadataLibrary(configuration: CompilerConfiguration, serializedM libraryVersion = null, compilerVersion = KotlinCompilerVersion.getVersion(), metadataVersion = KlibMetadataVersion.INSTANCE.toString(), - irVersion = null ) buildKotlinLibrary( diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KlibIrVersion.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KlibIrVersion.kt deleted file mode 100644 index f6d40365bb3..00000000000 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KlibIrVersion.kt +++ /dev/null @@ -1,32 +0,0 @@ -package org.jetbrains.kotlin.backend.common.serialization - -import org.jetbrains.kotlin.library.KLIB_PROPERTY_IR_VERSION -import org.jetbrains.kotlin.library.KotlinLibrary -import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion - -class KlibIrVersion(major: Int, minor: Int, patch: Int) : BinaryVersion(major, minor, patch) { - - override fun isCompatibleWithCurrentCompilerVersion(): Boolean = isCompatibleTo(INSTANCE) - - - companion object { - @JvmField - val INSTANCE = KlibIrVersion(1, 0, 0) - - @JvmField - val INVALID_VERSION = KlibIrVersion(-1, -1, -1) - } -} - -fun KlibIrVersion(vararg values: Int): KlibIrVersion { - if (values.size != 3) error("Ir version should be in major.minor.patch format: $values") - return KlibIrVersion(values[0], values[1], values[2]) -} - -val KotlinLibrary.metadataVersion: KlibIrVersion - get() { - val versionString = manifestProperties.getProperty(KLIB_PROPERTY_IR_VERSION) - val versionIntArray = BinaryVersion.parseVersionArray(versionString) - ?: error("Could not parse ir version: $versionString") - return KlibIrVersion(*versionIntArray) - } \ No newline at end of file diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index 7da36390023..6b5236b4706 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -703,7 +703,6 @@ fun serializeModuleIntoKlib( libraryVersion = null, compilerVersion = KotlinCompilerVersion.VERSION, metadataVersion = KlibMetadataVersion.INSTANCE.toString(), - irVersion = KlibIrVersion.INSTANCE.toString() ) val properties = Properties().also { p -> diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt index 8f72eaa00ce..9517a23a2e7 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt @@ -10,7 +10,6 @@ import com.intellij.psi.PsiElement import junit.framework.TestCase import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode import org.jetbrains.kotlin.backend.common.serialization.DeserializationStrategy -import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.backend.common.serialization.linkerissues.checkNoUnboundSymbols import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataIncrementalSerializer import org.jetbrains.kotlin.backend.common.serialization.metadata.makeSerializedKlibMetadata @@ -193,7 +192,6 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() { libraryVersion = null, compilerVersion = KotlinCompilerVersion.VERSION, metadataVersion = KlibMetadataVersion.INSTANCE.toString(), - irVersion = KlibIrVersion.INSTANCE.toString() ) val klibDir = org.jetbrains.kotlin.konan.file.createTempDir("testKlib") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KlibTestUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KlibTestUtil.kt index b4358727a5e..d88ee9e1439 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KlibTestUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KlibTestUtil.kt @@ -95,7 +95,6 @@ object KlibTestUtil { compilerVersion = null, abiVersion = null, metadataVersion = KlibMetadataVersion.INSTANCE.toString(), - irVersion = null ), builtInsPlatform = BuiltInsPlatform.COMMON, nativeTargets = emptyList(), diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt index f49dbfc3ba6..085d5af7de8 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt @@ -9,7 +9,6 @@ const val KLIB_PROPERTY_COMPILER_VERSION = "compiler_version" const val KLIB_PROPERTY_DEPENDENCY_VERSION = "dependency_version" const val KLIB_PROPERTY_LIBRARY_VERSION = "library_version" const val KLIB_PROPERTY_METADATA_VERSION = "metadata_version" -const val KLIB_PROPERTY_IR_VERSION = "ir_version" const val KLIB_PROPERTY_UNIQUE_NAME = "unique_name" const val KLIB_PROPERTY_SHORT_NAME = "short_name" const val KLIB_PROPERTY_DEPENDS = "depends" diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt index 2ecea235483..a2c0c9a101e 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibraryVersioning.kt @@ -7,7 +7,6 @@ data class KotlinLibraryVersioning( val compilerVersion: String?, val abiVersion: KotlinAbiVersion?, val metadataVersion: String?, - val irVersion: String? ) fun Properties.writeKonanLibraryVersioning(versions: KotlinLibraryVersioning) { @@ -15,7 +14,6 @@ fun Properties.writeKonanLibraryVersioning(versions: KotlinLibraryVersioning) { versions.libraryVersion?.let { this.setProperty(KLIB_PROPERTY_LIBRARY_VERSION, it) } versions.compilerVersion?.let { this.setProperty(KLIB_PROPERTY_COMPILER_VERSION, it) } versions.metadataVersion?.let { this.setProperty(KLIB_PROPERTY_METADATA_VERSION, it) } - versions.irVersion?.let { this.setProperty(KLIB_PROPERTY_IR_VERSION, it) } } fun Properties.readKonanLibraryVersioning(): KotlinLibraryVersioning { @@ -23,13 +21,11 @@ fun Properties.readKonanLibraryVersioning(): KotlinLibraryVersioning { val libraryVersion = this.getProperty(KLIB_PROPERTY_LIBRARY_VERSION) val compilerVersion = this.getProperty(KLIB_PROPERTY_COMPILER_VERSION) val metadataVersion = this.getProperty(KLIB_PROPERTY_METADATA_VERSION) - val irVersion = this.getProperty(KLIB_PROPERTY_IR_VERSION) return KotlinLibraryVersioning( abiVersion = abiVersion, libraryVersion = libraryVersion, compilerVersion = compilerVersion, metadataVersion = metadataVersion, - irVersion = irVersion ) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt index 6164846bf15..bf0237e36a2 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig import org.jetbrains.kotlin.backend.common.phaser.invokeToplevel import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode -import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.backend.common.serialization.linkerissues.checkNoUnboundSymbols import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor import org.jetbrains.kotlin.build.report.DoNothingBuildReporter @@ -253,9 +252,8 @@ class GenerateIrRuntime { val compilerVersion = KotlinCompilerVersion.getVersion() val abiVersion = KotlinAbiVersion.CURRENT val metadataVersion = KlibMetadataVersion.INSTANCE.toString() - val irVersion = KlibIrVersion.INSTANCE.toString() - val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion) + val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion) val file = createTempFile(directory = workingDir.toPath()).toFile() val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), false) val files = fullRuntimeSourceSet @@ -275,9 +273,8 @@ class GenerateIrRuntime { val compilerVersion = KotlinCompilerVersion.getVersion() val abiVersion = KotlinAbiVersion.CURRENT val metadataVersion = KlibMetadataVersion.INSTANCE.toString() - val irVersion = KlibIrVersion.INSTANCE.toString() - val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion) + val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion) val file = createTempFile(directory = workingDir.toPath()).toFile() val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), true) val files = fullRuntimeSourceSet diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt index dcae5bee3c4..e92f4bcf1c5 100644 --- a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt +++ b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt @@ -10,7 +10,6 @@ import kotlinx.metadata.klib.KlibModuleFragmentWriteStrategy import kotlinx.metadata.klib.KlibModuleMetadata import kotlinx.metadata.klib.className import kotlinx.metadata.klib.fqName -import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.library.impl.KonanLibraryLayoutForWriter @@ -42,7 +41,6 @@ fun createInteropLibrary( abiVersion = KotlinAbiVersion.CURRENT, compilerVersion = KotlinCompilerVersion.VERSION, metadataVersion = KlibMetadataVersion.INSTANCE.toString(), - irVersion = KlibIrVersion.INSTANCE.toString() ) val libFile = File(outputPath) val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir("klib") diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt index 8b093587a89..b337820cbe2 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.backend.konan.driver.phases -import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion import org.jetbrains.kotlin.backend.konan.KonanConfigKeys import org.jetbrains.kotlin.backend.konan.OutputFiles import org.jetbrains.kotlin.backend.konan.driver.PhaseContext @@ -30,13 +29,11 @@ internal val WriteKlibPhase = createSimpleNamedCompilerPhase = emptyList(), isInterop: Boolean = true, packageFqName: String? = "mock",