Revert "[Wasm] Implement IrLinkageError end enable partial linker"

This reverts commit 666a2f2.
JetBrains · Mar 6, 2024 · 1ca6f32 · 1ca6f32
1 parent 3b90682
commit 1ca6f32
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
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
@@ -773,7 +773,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
             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
@@ -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
@@ -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