From 1ca6f32e49d1a0b387d194af39769f142b2af20f Mon Sep 17 00:00:00 2001 From: Margarita Bobova Date: Wed, 6 Mar 2024 13:04:34 +0100 Subject: [PATCH] Revert "[Wasm] Implement IrLinkageError end enable partial linker" This reverts commit 666a2f267915bdcd41ee98e43812da3a20c29299. --- .../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 ed8d9521be7d3..3b64bfc1078d0 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 @@ -773,7 +773,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 90d518f713a0b..a185e7d818cca 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 @@ -111,8 +111,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 770d265fb77b3..558a09ac5f54b 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 @@ -43,9 +43,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 6088a8372a559..0000000000000 --- 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