[llvm] 78b4e7c - [WebAssembly] validate `table.grow` correctly (#80437)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 2 22:12:37 PST 2024
Author: Congcong Cai
Date: 2024-02-03T14:12:34+08:00
New Revision: 78b4e7c5e349d8c101b50affbd260eb109748f8f
URL: https://github.com/llvm/llvm-project/commit/78b4e7c5e349d8c101b50affbd260eb109748f8f
DIFF: https://github.com/llvm/llvm-project/commit/78b4e7c5e349d8c101b50affbd260eb109748f8f.diff
LOG: [WebAssembly] validate `table.grow` correctly (#80437)
This PR add support in wasm asm type checker to implement checker of
`table.grow`
Fixes: #79966.
Added:
Modified:
llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
llvm/test/MC/WebAssembly/tables.s
llvm/test/MC/WebAssembly/type-checker-errors.s
Removed:
################################################################################
diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
index 69466667e45a4..b4db7f63c4b6e 100644
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
@@ -288,6 +288,16 @@ bool WebAssemblyAsmTypeCheck::typeCheck(SMLoc ErrorLoc, const MCInst &Inst,
return true;
if (popType(ErrorLoc, wasm::ValType::I32))
return true;
+ } else if (Name == "table.size") {
+ if (getTable(Operands[1]->getStartLoc(), Inst, Type))
+ return true;
+ Stack.push_back(wasm::ValType::I32);
+ } else if (Name == "table.grow") {
+ if (getTable(Operands[1]->getStartLoc(), Inst, Type))
+ return true;
+ if (popType(ErrorLoc, wasm::ValType::I32))
+ return true;
+ Stack.push_back(wasm::ValType::I32);
} else if (Name == "table.fill") {
if (getTable(Operands[1]->getStartLoc(), Inst, Type))
return true;
diff --git a/llvm/test/MC/WebAssembly/tables.s b/llvm/test/MC/WebAssembly/tables.s
index 8239432eed88d..0ead2a4366527 100644
--- a/llvm/test/MC/WebAssembly/tables.s
+++ b/llvm/test/MC/WebAssembly/tables.s
@@ -71,8 +71,6 @@ table_set:
# CHECK: table_grow:
# CHECK-NEXT: .functype table_grow (i32) -> (i32)
-# CHECK-NEXT: i32.const 0
-# CHECK-NEXT: table.get foo
# CHECK-NEXT: local.get 0
# CHECK: table.grow foo
# CHECK-NEXT: local.get 0
@@ -80,8 +78,6 @@ table_set:
# CHECK-NEXT: end_function
table_grow:
.functype table_grow (i32) -> (i32)
- i32.const 0
- table.get foo
local.get 0
# ENC: table.grow foo # encoding: [0xfc,0x0f,0x80'A',0x80'A',0x80'A',0x80'A',A]
@@ -149,16 +145,13 @@ table_fill:
# BIN-NEXT: Offset: 0x2D
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x38
-# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
-# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x41
+# BIN-NEXT: Offset: 0x39
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x51
+# BIN-NEXT: Offset: 0x49
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x5A
+# BIN-NEXT: Offset: 0x52
# BIN-NEXT: Functions:
# BIN-NEXT: - Index: 0
# BIN-NEXT: Locals: []
@@ -171,7 +164,7 @@ table_fill:
# BIN-NEXT: Body: 200020012680808080000B
# BIN-NEXT: - Index: 3
# BIN-NEXT: Locals: []
-# BIN-NEXT: Body: 41002580808080002000FC0F808080800020006A0B
+# BIN-NEXT: Body: 2000FC0F808080800020006A0B
# BIN-NEXT: - Index: 4
# BIN-NEXT: Locals: []
# BIN-NEXT: Body: 200041002582808080002001FC1182808080000B
diff --git a/llvm/test/MC/WebAssembly/type-checker-errors.s b/llvm/test/MC/WebAssembly/type-checker-errors.s
index 1501bedec393c..aab69201d4a7e 100644
--- a/llvm/test/MC/WebAssembly/type-checker-errors.s
+++ b/llvm/test/MC/WebAssembly/type-checker-errors.s
@@ -215,6 +215,26 @@ table_fill_type_mismatch_3:
table.fill valid_table
end_function
+table_grow_non_exist_table:
+ .functype table_grow_non_exist_table () -> (i32)
+ i32.const 0
+# CHECK: [[@LINE+1]]:14: error: symbol invalid_table missing .tabletype
+ table.grow invalid_table
+ end_function
+
+table_grow_wrong_parameter:
+ .functype table_grow_non_exist_table () -> (i32)
+# CHECK: [[@LINE+1]]:3: error: empty stack while popping i32
+ table.grow valid_table
+ end_function
+
+table_grow_wrong_result:
+ .functype table_grow_non_exist_table () -> (f32)
+ i32.const 0
+ table.grow valid_table
+# CHECK: [[@LINE+1]]:3: error: popped i32, expected f32
+ end_function
+
drop_empty_stack_while_popping:
.functype drop_empty_stack_while_popping () -> ()
# CHECK: :[[@LINE+1]]:3: error: empty stack while popping value
More information about the llvm-commits
mailing list