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

[Wasm] Require location for buildConstF32 & buildConstF64 and fix all usages

Browse Source
This commit is contained in:
Zalim Bashorov
2022-12-07 12:41:27 +01:00
parent 332aca10b0
commit e69bbdd5b4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt
+4 -4
View File
@@ -478,8 +478,8 @@ fun generateDefaultInitializerForType(type: WasmType, g: WasmExpressionBuilder)
when (type) { when (type) {
WasmI32 -> g.buildConstI32(0, location) WasmI32 -> g.buildConstI32(0, location)
WasmI64 -> g.buildConstI64(0, location) WasmI64 -> g.buildConstI64(0, location)
WasmF32 -> g.buildConstF32(0f) WasmF32 -> g.buildConstF32(0f, location)
WasmF64 -> g.buildConstF64(0.0) WasmF64 -> g.buildConstF64(0.0, location)
is WasmRefNullType -> g.buildRefNull(type.heapType) is WasmRefNullType -> g.buildRefNull(type.heapType)
is WasmRefNullNoneType -> g.buildRefNull(WasmHeapType.Simple.NullNone) is WasmRefNullNoneType -> g.buildRefNull(WasmHeapType.Simple.NullNone)
is WasmRefNullExternrefType -> g.buildRefNull(WasmHeapType.Simple.NullNoExtern) is WasmRefNullExternrefType -> g.buildRefNull(WasmHeapType.Simple.NullNoExtern)
@@ -512,8 +512,8 @@ fun generateConstExpression(expression: IrConst<*>, body: WasmExpressionBuilder,
is IrConstKind.Int -> body.buildConstI32(kind.valueOf(expression), location) is IrConstKind.Int -> body.buildConstI32(kind.valueOf(expression), location)
is IrConstKind.Long -> body.buildConstI64(kind.valueOf(expression), location) is IrConstKind.Long -> body.buildConstI64(kind.valueOf(expression), location)
is IrConstKind.Char -> body.buildConstI32(kind.valueOf(expression).code, location) is IrConstKind.Char -> body.buildConstI32(kind.valueOf(expression).code, location)
is IrConstKind.Float -> body.buildConstF32(kind.valueOf(expression)) is IrConstKind.Float -> body.buildConstF32(kind.valueOf(expression), location)
is IrConstKind.Double -> body.buildConstF64(kind.valueOf(expression)) is IrConstKind.Double -> body.buildConstF64(kind.valueOf(expression), location)
is IrConstKind.String -> { is IrConstKind.String -> {
val stringValue = kind.valueOf(expression) val stringValue = kind.valueOf(expression)
val (literalAddress, literalPoolId) = context.referenceStringLiteralAddressAndId(stringValue) val (literalAddress, literalPoolId) = context.referenceStringLiteralAddressAndId(stringValue)
wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt
+4 -4
View File
@@ -24,12 +24,12 @@ abstract class WasmExpressionBuilder {
buildInstr(WasmOp.I64_CONST, location, WasmImmediate.ConstI64(value)) buildInstr(WasmOp.I64_CONST, location, WasmImmediate.ConstI64(value))
} }
fun buildConstF32(value: Float) { fun buildConstF32(value: Float, location: SourceLocation) {
buildInstr(WasmOp.F32_CONST, WasmImmediate.ConstF32(value.toRawBits().toUInt())) buildInstr(WasmOp.F32_CONST, location, WasmImmediate.ConstF32(value.toRawBits().toUInt()))
} }
fun buildConstF64(value: Double) { fun buildConstF64(value: Double, location: SourceLocation) {
buildInstr(WasmOp.F64_CONST, WasmImmediate.ConstF64(value.toRawBits().toULong())) buildInstr(WasmOp.F64_CONST, location, WasmImmediate.ConstF64(value.toRawBits().toULong()))
} }
fun buildConstI32Symbol(value: WasmSymbol<Int>) { fun buildConstI32Symbol(value: WasmSymbol<Int>) {