azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wasm] Require location for buildStructGet and fix all usages

Browse Source
This commit is contained in:
Zalim Bashorov
2022-12-13 19:16:23 +01:00
parent 530438dfcb
commit e7dc443c18
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
+10 -10
View File
@@ -361,6 +361,8 @@ class BodyGenerator(
} }
private fun generateCall(call: IrFunctionAccessExpression) { private fun generateCall(call: IrFunctionAccessExpression) {
val location = call.getSourceLocation()
// Box intrinsic has an additional klass ID argument. // Box intrinsic has an additional klass ID argument.
// Processing it separately // Processing it separately
if (call.symbol == wasmSymbols.boxIntrinsic) { if (call.symbol == wasmSymbols.boxIntrinsic) {
@@ -427,8 +429,8 @@ class BodyGenerator(
//TODO: check why it could be needed //TODO: check why it could be needed
generateRefNullCast(receiver.type, klass.defaultType) generateRefNullCast(receiver.type, klass.defaultType)
body.buildStructGet(context.referenceGcType(klass.symbol), WasmSymbol(0)) body.buildStructGet(context.referenceGcType(klass.symbol), WasmSymbol(0), location)
body.buildStructGet(context.referenceVTableGcType(klass.symbol), WasmSymbol(vfSlot)) body.buildStructGet(context.referenceVTableGcType(klass.symbol), WasmSymbol(vfSlot), location)
body.buildInstr(WasmOp.CALL_REF, WasmImmediate.TypeIdx(context.referenceFunctionType(function.symbol))) body.buildInstr(WasmOp.CALL_REF, WasmImmediate.TypeIdx(context.referenceFunctionType(function.symbol)))
body.commentGroupEnd() body.commentGroupEnd()
} else { } else {
@@ -437,16 +439,16 @@ class BodyGenerator(
generateExpression(call.dispatchReceiver!!) generateExpression(call.dispatchReceiver!!)
body.commentGroupStart { "interface call: ${function.fqNameWhenAvailable}" } body.commentGroupStart { "interface call: ${function.fqNameWhenAvailable}" }
body.buildStructGet(context.referenceGcType(irBuiltIns.anyClass), WasmSymbol(1)) body.buildStructGet(context.referenceGcType(irBuiltIns.anyClass), WasmSymbol(1), location)
val classITableReference = context.referenceClassITableGcType(symbol) val classITableReference = context.referenceClassITableGcType(symbol)
body.buildRefCastNullStatic(classITableReference) body.buildRefCastNullStatic(classITableReference)
body.buildStructGet(classITableReference, context.referenceClassITableInterfaceSlot(symbol)) body.buildStructGet(classITableReference, context.referenceClassITableInterfaceSlot(symbol), location)
val vfSlot = context.getInterfaceMetadata(symbol).methods val vfSlot = context.getInterfaceMetadata(symbol).methods
.indexOfFirst { it.function == function } .indexOfFirst { it.function == function }
body.buildStructGet(context.referenceVTableGcType(symbol), WasmSymbol(vfSlot)) body.buildStructGet(context.referenceVTableGcType(symbol), WasmSymbol(vfSlot), location)
body.buildInstr(WasmOp.CALL_REF, WasmImmediate.TypeIdx(context.referenceFunctionType(function.symbol))) body.buildInstr(WasmOp.CALL_REF, WasmImmediate.TypeIdx(context.referenceFunctionType(function.symbol)))
body.commentGroupEnd() body.commentGroupEnd()
} else { } else {
@@ -459,9 +461,7 @@ class BodyGenerator(
} else { } else {
// Static function call // Static function call
withLocation(call.getSourceLocation()) { body.buildCall(context.referenceFunction(function.symbol), location)
body.buildCall(context.referenceFunction(function.symbol), location)
}
} }
// Unit types don't cross function boundaries // Unit types don't cross function boundaries
@@ -533,9 +533,9 @@ class BodyGenerator(
body.buildBlock("isInterface", WasmI32) { outerLabel -> body.buildBlock("isInterface", WasmI32) { outerLabel ->
body.buildBlock("isInterface", WasmRefNullType(WasmHeapType.Simple.Data)) { innerLabel -> body.buildBlock("isInterface", WasmRefNullType(WasmHeapType.Simple.Data)) { innerLabel ->
body.buildGetLocal(parameterLocal, location) body.buildGetLocal(parameterLocal, location)
body.buildStructGet(context.referenceGcType(irBuiltIns.anyClass), WasmSymbol(1)) body.buildStructGet(context.referenceGcType(irBuiltIns.anyClass), WasmSymbol(1), location)
body.buildBrInstr(WasmOp.BR_ON_CAST_FAIL_DEPRECATED, innerLabel, classITable) body.buildBrInstr(WasmOp.BR_ON_CAST_FAIL_DEPRECATED, innerLabel, classITable)
body.buildStructGet(classITable, context.referenceClassITableInterfaceSlot(irInterface.symbol)) body.buildStructGet(classITable, context.referenceClassITableInterfaceSlot(irInterface.symbol), location)
body.buildInstr(WasmOp.REF_IS_NULL) body.buildInstr(WasmOp.REF_IS_NULL)
body.buildInstr(WasmOp.I32_EQZ) body.buildInstr(WasmOp.I32_EQZ)
body.buildBr(outerLabel) body.buildBr(outerLabel)
wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt
+2 -1
View File
@@ -145,9 +145,10 @@ abstract class WasmExpressionBuilder {
buildInstr(WasmOp.GLOBAL_SET, location, WasmImmediate.GlobalIdx(global)) buildInstr(WasmOp.GLOBAL_SET, location, WasmImmediate.GlobalIdx(global))
} }
fun buildStructGet(struct: WasmSymbol<WasmTypeDeclaration>, fieldId: WasmSymbol<Int>) { fun buildStructGet(struct: WasmSymbol<WasmTypeDeclaration>, fieldId: WasmSymbol<Int>, location: SourceLocation) {
buildInstr( buildInstr(
WasmOp.STRUCT_GET, WasmOp.STRUCT_GET,
location,
WasmImmediate.GcType(struct), WasmImmediate.GcType(struct),
WasmImmediate.StructFieldIdx(fieldId) WasmImmediate.StructFieldIdx(fieldId)
) )