From 42f2edd28208aaee066d24c00114fb7cbaf92ca6 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 13 Dec 2022 20:20:32 +0100 Subject: [PATCH] [Wasm] Require location for `buildThrow` and fix all usages --- .../jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt | 2 +- .../src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt index ea159975f29..1ad239aef10 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt @@ -142,7 +142,7 @@ class BodyGenerator( override fun visitThrow(expression: IrThrow) { generateExpression(expression.value) - body.buildThrow(functionContext.tagIdx) + body.buildThrow(functionContext.tagIdx, expression.getSourceLocation()) } override fun visitTry(aTry: IrTry) { diff --git a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt index eed15184d47..62ae816675d 100644 --- a/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt +++ b/wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt @@ -94,8 +94,8 @@ abstract class WasmExpressionBuilder { buildBrInstr(WasmOp.BR, absoluteBlockLevel, location) } - fun buildThrow(tagIdx: Int) { - buildInstr(WasmOp.THROW, WasmImmediate.TagIdx(tagIdx)) + fun buildThrow(tagIdx: Int, location: SourceLocation) { + buildInstr(WasmOp.THROW, location, WasmImmediate.TagIdx(tagIdx)) } @Suppress("UNUSED_PARAMETER")