Skip to content

Commit 1ca6f32

Browse files
committed
Revert "[Wasm] Implement IrLinkageError end enable partial linker"
This reverts commit 666a2f2.
1 parent 3b90682 commit 1ca6f32

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
773773
mode = arguments.partialLinkageMode,
774774
logLevel = arguments.partialLinkageLogLevel,
775775
compilerModeAllowsUsingPartialLinkage =
776-
/* no PL when producing KLIB */ arguments.includes != null,
776+
/* disabled for WASM for now */ !arguments.wasm && /* no PL when producing KLIB */ arguments.includes != null,
777777
onWarning = { messageCollector.report(WARNING, it) },
778778
onError = { messageCollector.report(ERROR, it) }
779779
)

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmSymbols.kt

-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ class WasmSymbols(
111111
override val returnIfSuspended =
112112
getInternalFunction("returnIfSuspended")
113113

114-
val throwLinkageError = getInternalFunction("throwLinkageError")
115-
116114
val enumEntries = getIrClass(FqName.fromSegments(listOf("kotlin", "enums", "EnumEntries")))
117115
val createEnumEntries = findFunctions(enumsInternalPackage.memberScope, Name.identifier("enumEntries"))
118116
.find { it.valueParameters.firstOrNull()?.type?.isFunctionType == false }

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/BuiltInsLowering.kt

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ class BuiltInsLowering(val context: WasmBackendContext) : FileLoweringPass {
4343
builder: DeclarationIrBuilder
4444
): IrExpression {
4545
when (val symbol = call.symbol) {
46-
irBuiltins.linkageErrorSymbol -> {
47-
return irCall(call, context.wasmSymbols.throwLinkageError)
48-
}
4946
irBuiltins.ieee754equalsFunByOperandType[irBuiltins.floatClass] -> {
5047
if (call.getValueArgument(0)!!.type.isNullable() || call.getValueArgument(1)!!.type.isNullable()) {
5148
return irCall(call, symbols.nullableFloatIeee754Equals)

libraries/stdlib/wasm/internal/kotlin/wasm/internal/LinkageError.kt

-12
This file was deleted.

0 commit comments

Comments
 (0)