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

[Wasm] Revert ref cast and test instructions to be compatible with Binaryen

Browse Source
This commit is contained in:
Zalim Bashorov
2022-11-17 19:19:41 +01:00
parent 5f140dac21
commit 7f8f7aa050
7 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/Operators.kt
+18 -7
View File
@@ -372,13 +372,11 @@ enum class WasmOp(
I31_GET_U("i31.get_u", 0xFB_22),
REF_EQ("ref.eq", 0xD5),
REF_TEST("ref.test", 0xFB_40, HEAP_TYPE),
REF_TEST_NULL("ref.test null", 0xFB_48, HEAP_TYPE),
REF_CAST("ref.cast", 0xFB_41, HEAP_TYPE),
REF_CAST_NULL("ref.cast null", 0xFB_49, HEAP_TYPE),
// TODO remove as soon as V8 support new instructions, see below
BR_ON_CAST_FAIL("br_on_cast_fail", 0xfb47, listOf(LABEL_IDX, STRUCT_TYPE_IDX)),
// Not yet supported by Binaryen
// REF_TEST("ref.test", 0xFB_40, HEAP_TYPE),
// REF_TEST_NULL("ref.test null", 0xFB_48, HEAP_TYPE),
// REF_CAST("ref.cast", 0xFB_41, HEAP_TYPE),
// REF_CAST_NULL("ref.cast null", 0xFB_49, HEAP_TYPE),
// Not yet supported by V8
// BR_ON_CAST("br_on_cast", 0xFB42, listOf(LABEL_IDX, HEAP_TYPE)),
@@ -389,6 +387,19 @@ enum class WasmOp(
EXTERN_INTERNALIZE("extern.internalize", 0xfb70), // externref -> anyref
EXTERN_EXTERNALIZE("extern.externalize", 0xfb71), // anyref -> externref
// ------------------------
// Deprecated instructions
// TODO Remove as soon as V8 & Binaryen support new instructions.
// Revert ________.
REF_TEST_DEPRECATED("ref.test", 0xFB_44, STRUCT_TYPE_IDX),
REF_CAST_DEPRECATED("ref.cast", 0xFB_45, STRUCT_TYPE_IDX),
REF_IS_DATA_DEPRECATED("ref.is_data", 0xFB_51),
REF_AS_DATA_DEPRECATED("ref.as_data", 0xFB_59),
BR_ON_CAST_FAIL_DEPRECATED("br_on_cast_fail", 0xFB_47, listOf(LABEL_IDX, STRUCT_TYPE_IDX)),
// ============================================================
// Pseudo-instruction, just alias for a normal call. It's used to easily spot get_unit on the wasm level.
GET_UNIT("call", 0x10, FUNC_IDX)
wasm/wasm.ir/src/org/jetbrains/kotlin/wasm/ir/WasmExpressionBuilder.kt
+2 -2
View File
@@ -157,11 +157,11 @@ abstract class WasmExpressionBuilder {
}
fun buildRefCastNullStatic(toType: WasmSymbolReadOnly<WasmTypeDeclaration>) {
buildInstr(WasmOp.REF_CAST_NULL, WasmImmediate.HeapType(WasmHeapType.Type(toType)))
buildInstr(WasmOp.REF_CAST_DEPRECATED, WasmImmediate.TypeIdx(toType))
}
fun buildRefTestStatic(toType: WasmSymbolReadOnly<WasmTypeDeclaration>) {
buildInstr(WasmOp.REF_TEST, WasmImmediate.HeapType(WasmHeapType.Type(toType)))
buildInstr(WasmOp.REF_TEST_DEPRECATED, WasmImmediate.TypeIdx(toType))
}
fun buildRefNull(type: WasmHeapType) {