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 6c061851225..d451c0c564d 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 @@ -189,7 +189,7 @@ class BodyGenerator( generateInstanceFieldAccess(field) } } else { - body.buildGetGlobal(context.referenceGlobalField(field.symbol)) + body.buildGetGlobal(context.referenceGlobalField(field.symbol), expression.getSourceLocation()) body.commentPreviousInstr { "type: ${field.type.render()}" } } } @@ -300,9 +300,9 @@ class BodyGenerator( private fun generateAnyParameters(klassSymbol: IrClassSymbol, location: SourceLocation) { //ClassITable and VTable load body.commentGroupStart { "Any parameters" } - body.buildGetGlobal(context.referenceGlobalVTable(klassSymbol)) + body.buildGetGlobal(context.referenceGlobalVTable(klassSymbol), location) if (klassSymbol.owner.hasInterfaceSuperClass()) { - body.buildGetGlobal(context.referenceGlobalClassITable(klassSymbol)) + body.buildGetGlobal(context.referenceGlobalClassITable(klassSymbol), location) } else { body.buildRefNull(WasmHeapType.Simple.Data) } 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 8ed53024c1a..c0d90719dad 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 @@ -137,8 +137,8 @@ abstract class WasmExpressionBuilder { buildInstr(WasmOp.LOCAL_SET, location, WasmImmediate.LocalIdx(local)) } - fun buildGetGlobal(global: WasmSymbol) { - buildInstr(WasmOp.GLOBAL_GET, WasmImmediate.GlobalIdx(global)) + fun buildGetGlobal(global: WasmSymbol, location: SourceLocation) { + buildInstr(WasmOp.GLOBAL_GET, location, WasmImmediate.GlobalIdx(global)) } fun buildSetGlobal(global: WasmSymbol) {