Cleanup: drop KlibIrVersion
Review: https://jetbrains.team/p/kt/reviews/8401 In scope of: KT-55082 Because this version isn't used for anything. We have KotlinAbiVersion to version the IR format.
This commit is contained in:
@@ -22,7 +22,6 @@ fun buildKotlinMetadataLibrary(configuration: CompilerConfiguration, serializedM
|
||||
libraryVersion = null,
|
||||
compilerVersion = KotlinCompilerVersion.getVersion(),
|
||||
metadataVersion = KlibMetadataVersion.INSTANCE.toString(),
|
||||
irVersion = null
|
||||
)
|
||||
|
||||
buildKotlinLibrary(
|
||||
|
||||
-32
@@ -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)
|
||||
}
|
||||
@@ -703,7 +703,6 @@ fun serializeModuleIntoKlib(
|
||||
libraryVersion = null,
|
||||
compilerVersion = KotlinCompilerVersion.VERSION,
|
||||
metadataVersion = KlibMetadataVersion.INSTANCE.toString(),
|
||||
irVersion = KlibIrVersion.INSTANCE.toString()
|
||||
)
|
||||
|
||||
val properties = Properties().also { p ->
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -95,7 +95,6 @@ object KlibTestUtil {
|
||||
compilerVersion = null,
|
||||
abiVersion = null,
|
||||
metadataVersion = KlibMetadataVersion.INSTANCE.toString(),
|
||||
irVersion = null
|
||||
),
|
||||
builtInsPlatform = BuiltInsPlatform.COMMON,
|
||||
nativeTargets = emptyList(),
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
-2
@@ -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")
|
||||
|
||||
-3
@@ -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<PhaseContext, Seria
|
||||
val compilerVersion = KotlinCompilerVersion.getVersion().toString()
|
||||
val libraryVersion = configuration.get(KonanConfigKeys.LIBRARY_VERSION)
|
||||
val metadataVersion = KlibMetadataVersion.INSTANCE.toString()
|
||||
val irVersion = KlibIrVersion.INSTANCE.toString()
|
||||
val versions = KotlinLibraryVersioning(
|
||||
abiVersion = abiVersion,
|
||||
libraryVersion = libraryVersion,
|
||||
compilerVersion = compilerVersion,
|
||||
metadataVersion = metadataVersion,
|
||||
irVersion = irVersion
|
||||
)
|
||||
val target = config.target
|
||||
val manifestProperties = config.manifestProperties
|
||||
|
||||
@@ -116,7 +116,6 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v
|
||||
val headerCompilerVersion = library.versions.compilerVersion
|
||||
val headerLibraryVersion = library.versions.libraryVersion
|
||||
val headerMetadataVersion = library.versions.metadataVersion
|
||||
val headerIrVersion = library.versions.irVersion
|
||||
val moduleName = ModuleDeserializer(library.moduleHeaderData).moduleName
|
||||
|
||||
println("")
|
||||
@@ -126,7 +125,6 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?, v
|
||||
println("Compiler version: ${headerCompilerVersion}")
|
||||
println("Library version: $headerLibraryVersion")
|
||||
println("Metadata version: $headerMetadataVersion")
|
||||
println("IR version: $headerIrVersion")
|
||||
|
||||
if (library is KonanLibrary) {
|
||||
val targets = library.targetList.joinToString(", ")
|
||||
|
||||
@@ -174,7 +174,7 @@ internal class MockResultsConsumer : ResultsConsumer {
|
||||
fun MockNativeManifestDataProvider(
|
||||
target: CommonizerTarget,
|
||||
uniqueName: String = "mock",
|
||||
versions: KotlinLibraryVersioning = KotlinLibraryVersioning(null, null, null, null, null),
|
||||
versions: KotlinLibraryVersioning = KotlinLibraryVersioning(null, null, null, null),
|
||||
dependencies: List<String> = emptyList(),
|
||||
isInterop: Boolean = true,
|
||||
packageFqName: String? = "mock",
|
||||
|
||||
Reference in New Issue
Block a user