From edfdc88d6dc9baf6eb26e7adc5522a3892768376 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 5 Nov 2020 22:32:42 +0300 Subject: [PATCH] Dropped outdated klib version compatibility mechanisms (cherry picked from commit 31fe91b6553ba08b83c581bfa8341e4a21805e97) --- .../src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 3 --- .../kotlin/cli/bc/K2NativeCompilerArguments.kt | 3 --- .../kotlin/backend/konan/KonanConfigurationKeys.kt | 2 -- .../backend/konan/KonanLibrariesResolveSupport.kt | 4 ---- .../kotlin/konan/library/SearchPathResolver.kt | 14 +++----------- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index c0182e46008..61cfb7e85da 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -191,9 +191,6 @@ class K2Native : CLICompiler() { arguments.disablePhases.toNonNullList()) put(LIST_PHASES, arguments.listPhases) - put(COMPATIBLE_COMPILER_VERSIONS, - arguments.compatibleCompilerVersions.toNonNullList()) - put(ENABLE_ASSERTIONS, arguments.enableAssertions) put(MEMORY_MODEL, when (arguments.memoryModel) { diff --git a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt index 0b596f5269b..e1626f30e83 100644 --- a/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt +++ b/kotlin-native/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.kt @@ -121,9 +121,6 @@ class K2NativeCompilerArguments : CommonCompilerArguments() { @Argument(value="-Xcheck-dependencies", deprecatedName = "--check_dependencies", description = "Check dependencies and download the missing ones") var checkDependencies: Boolean = false - @Argument(value="-Xcompatible-compiler-version", valueDescription = "", description = "Assume the given compiler version to be binary compatible") - var compatibleCompilerVersions: Array? = null - @Argument(value = EMBED_BITCODE_FLAG, description = "Embed LLVM IR bitcode as data") var embedBitcode: Boolean = false diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt index 8a25ab08e25..140a23265be 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfigurationKeys.kt @@ -14,8 +14,6 @@ class KonanConfigKeys { // Keep the list lexically sorted. val CHECK_DEPENDENCIES: CompilerConfigurationKey = CompilerConfigurationKey.create("check dependencies and download the missing ones") - val COMPATIBLE_COMPILER_VERSIONS: CompilerConfigurationKey> - = CompilerConfigurationKey.create("compatible compiler versions") val DEBUG: CompilerConfigurationKey = CompilerConfigurationKey.create("add debug information") val DISABLE_FAKE_OVERRIDE_VALIDATOR: CompilerConfigurationKey diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt index d2f62892442..7ae2d5ee1c9 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLibrariesResolveSupport.kt @@ -53,15 +53,11 @@ class KonanLibrariesResolveSupport( } } - private val compatibleCompilerVersions: List = - configuration.getList(KonanConfigKeys.COMPATIBLE_COMPILER_VERSIONS).map { it.parseCompilerVersion() } - private val resolver = defaultResolver( repositories, libraryNames.filter { it.contains(File.separator) }, target, distribution, - compatibleCompilerVersions, resolverLogger ).libraryResolver() diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt index da61e9703b2..5acc8ef73aa 100644 --- a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt +++ b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt @@ -11,31 +11,27 @@ import org.jetbrains.kotlin.library.impl.createKotlinLibrary import org.jetbrains.kotlin.util.DummyLogger import org.jetbrains.kotlin.util.Logger -interface SearchPathResolverWithTarget: SearchPathResolverWithAttributes { +interface SearchPathResolverWithTarget: SearchPathResolver { val target: KonanTarget } fun defaultResolver( repositories: List, target: KonanTarget, - distribution: Distribution, - compatibleCompilerVersions: List = emptyList() -): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution, compatibleCompilerVersions) + distribution: Distribution +): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution) fun defaultResolver( repositories: List, directLibs: List, target: KonanTarget, distribution: Distribution, - compatibleCompilerVersions: List = emptyList(), logger: Logger = DummyLogger, skipCurrentDir: Boolean = false ): SearchPathResolverWithTarget = KonanLibraryProperResolver( repositories, directLibs, target, - listOf(KotlinAbiVersion.CURRENT), - compatibleCompilerVersions, distribution.klib, distribution.localKonanDir.absolutePath, skipCurrentDir, @@ -65,16 +61,12 @@ internal class KonanLibraryProperResolver( repositories: List, directLibs: List, override val target: KonanTarget, - knownAbiVersions: List?, - knownCompilerVersions: List?, distributionKlib: String?, localKonanDir: String?, skipCurrentDir: Boolean, override val logger: Logger ) : KotlinLibraryProperResolverWithAttributes( repositories, directLibs, - knownAbiVersions, - knownCompilerVersions, distributionKlib, localKonanDir, skipCurrentDir,