From 84a5a9ff5362883b5abe7ba20559b7c35274441a Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Mon, 11 Mar 2024 15:27:33 +0100 Subject: [PATCH] Revert "[Wasm] Implement IrLinkageError end enable partial linker" This reverts commit c0f387dbd1faa71d2e0c22f29e38a80decc7aa54. --- .../org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt | 2 +- .../org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt | 2 -- .../kotlin/backend/wasm/lower/BuiltInsLowering.kt | 3 --- .../internal/kotlin/wasm/internal/LinkageError.kt | 12 ------------ 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 libraries/stdlib/wasm/internal/kotlin/wasm/internal/LinkageError.kt diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt index 8c391ffd703..3da2e954697 100644 --- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt +++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt @@ -808,7 +808,7 @@ class K2JsIrCompiler : CLICompiler() { mode = arguments.partialLinkageMode, logLevel = arguments.partialLinkageLogLevel, compilerModeAllowsUsingPartialLinkage = - /* no PL when producing KLIB */ arguments.includes != null, + /* disabled for WASM for now */ !arguments.wasm && /* no PL when producing KLIB */ arguments.includes != null, onWarning = { messageCollector.report(WARNING, it) }, onError = { messageCollector.report(ERROR, it) } ) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt index 556e359365e..e52e89c5b6a 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt @@ -110,8 +110,6 @@ class WasmSymbols( override val returnIfSuspended = getInternalFunction("returnIfSuspended") - val throwLinkageError = getInternalFunction("throwLinkageError") - val enumEntries = getIrClass(FqName.fromSegments(listOf("kotlin", "enums", "EnumEntries"))) val createEnumEntries = findFunctions(enumsInternalPackage.memberScope, Name.identifier("enumEntries")) .find { it.valueParameters.firstOrNull()?.type?.isFunctionType == false } diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt index 1a3d4fb69c0..9862c506506 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt @@ -46,9 +46,6 @@ class BuiltInsLowering(val context: WasmBackendContext) : FileLoweringPass { builder: DeclarationIrBuilder ): IrExpression { when (val symbol = call.symbol) { - irBuiltins.linkageErrorSymbol -> { - return irCall(call, context.wasmSymbols.throwLinkageError) - } irBuiltins.ieee754equalsFunByOperandType[irBuiltins.floatClass] -> { if (call.getValueArgument(0)!!.type.isNullable() || call.getValueArgument(1)!!.type.isNullable()) { return irCall(call, symbols.nullableFloatIeee754Equals) diff --git a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/LinkageError.kt b/libraries/stdlib/wasm/internal/kotlin/wasm/internal/LinkageError.kt deleted file mode 100644 index 6088a8372a5..00000000000 --- a/libraries/stdlib/wasm/internal/kotlin/wasm/internal/LinkageError.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package kotlin.wasm.internal - -internal class IrLinkageError(message: String?) : Error(message) - -internal fun throwLinkageError(message: String?): Nothing { - throw IrLinkageError(message) -} \ No newline at end of file