From 6161f44d91e235750077e1aaa5faff7047316190 Mon Sep 17 00:00:00 2001 From: Troels Bjerre Lund Date: Fri, 15 Dec 2023 16:44:12 +0000 Subject: [PATCH] Remove needsProfileLibrary argument Second phase of removing LLVM coverage. This had to wait until after the bootstrap advance. Co-authored-by: Troels Lund Merge-request: KOTLIN-MR-838 Merged-by: Alexander Shabalin --- .../org/jetbrains/kotlin/KotlinNativeTest.kt | 1 - .../jetbrains/kotlin/cpp/CompileToExecutable.kt | 1 - .../org/jetbrains/kotlin/konan/target/Linker.kt | 14 +++++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt index cdcef3df2d3..1ef4d95cd0b 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt @@ -528,7 +528,6 @@ open class KonanDynamicTest : KonanStandaloneTest() { debug = isDebug, kind = LinkerOutputKind.EXECUTABLE, outputDsymBundle = "", - needsProfileLibrary = false, mimallocEnabled = false ) commands.map { cmd -> diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt index eec9c04b438..51c7cebdda3 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/CompileToExecutable.kt @@ -225,7 +225,6 @@ abstract class CompileToExecutable : DefaultTask() { debug = true, kind = LinkerOutputKind.EXECUTABLE, outputDsymBundle = outputFile.asFile.get().absolutePath + ".dSYM", - needsProfileLibrary = false, mimallocEnabled = mimallocEnabled.get(), sanitizer = sanitizer.orNull ).map { it.argsWithExecutable } diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt index 4758b92ee8a..25ce9170ae8 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt @@ -75,7 +75,7 @@ abstract class LinkerFlags(val configurables: Configurables) { libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean = false, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind? = null): List /** @@ -118,7 +118,7 @@ class AndroidLinker(targetProperties: AndroidConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { require(sanitizer == null) { "Sanitizers are unsupported" @@ -234,7 +234,7 @@ class MacOSBasedLinker(targetProperties: AppleConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { if (kind == LinkerOutputKind.STATIC_LIBRARY) { require(sanitizer == null) { @@ -374,7 +374,7 @@ class GccBasedLinker(targetProperties: GccConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { if (kind == LinkerOutputKind.STATIC_LIBRARY) { require(sanitizer == null) { @@ -465,7 +465,7 @@ class MingwLinker(targetProperties: MingwConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { require(sanitizer == null) { "Sanitizers are unsupported" @@ -517,7 +517,7 @@ class WasmLinker(targetProperties: WasmConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { if (kind != LinkerOutputKind.EXECUTABLE) throw Error("Unsupported linker output kind") require(sanitizer == null) { @@ -573,7 +573,7 @@ open class ZephyrLinker(targetProperties: ZephyrConfigurables) libraries: List, linkerArgs: List, optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String, - needsProfileLibrary: Boolean, mimallocEnabled: Boolean, + mimallocEnabled: Boolean, sanitizer: SanitizerKind?): List { if (kind != LinkerOutputKind.EXECUTABLE) throw Error("Unsupported linker output kind: $kind") require(sanitizer == null) {