Skip to content

Fix parsing of table imports #6446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kripken merged 3 commits into from
Mar 27, 2024
Merged

Fix parsing of table imports #6446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e749552
Wrong results
vouillon Mar 27, 2024
2ed61d6
Fix parsing of table imports
vouillon Mar 25, 2024
8a4cfe3
Remove redundant incrementation
vouillon Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/wasm/wasm-s-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3737,10 +3737,13 @@ void SExpressionWasmBuilder::parseImport(Element& s) {
table->max = Table::kUnlimitedSize;
}

wasm.addTable(std::move(table));

j++; // funcref
// ends with the table element type
table->type = elementToType(*inner[j++]);
if (!table->type.isRef()) {
throw SParseException("Only reference types are valid for tables", s);
}

wasm.addTable(std::move(table));
} else if (kind == ExternalKind::Memory) {
auto memory = std::make_unique<Memory>();
memory->setName(name, hasExplicitName);
Expand Down
21 changes: 18 additions & 3 deletions test/lit/basic/table-import.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,48 @@
;; CHECK-BIN-NODEBUG: (type $0 (func))
(type $0 (func))
(import "env" "table" (table 1 1 funcref))
(import "env" "table2" (table 1 1 anyref))
(import "env" "table3" (table 1 1 (ref null $0)))
(elem (i32.const 0) $foo)
;; CHECK-TEXT: (import "env" "table" (table $timport$0 1 1 funcref))

;; CHECK-TEXT: (import "env" "table2" (table $timport$1 1 1 anyref))

;; CHECK-TEXT: (import "env" "table3" (table $timport$2 1 1 (ref null $0)))

;; CHECK-TEXT: (memory $0 0)
;; CHECK-BIN: (import "env" "table" (table $timport$0 1 1 funcref))

;; CHECK-BIN: (import "env" "table2" (table $timport$1 1 1 anyref))

;; CHECK-BIN: (import "env" "table3" (table $timport$2 1 1 (ref null $0)))

;; CHECK-BIN: (memory $0 0)
;; CHECK-BIN-NODEBUG: (import "env" "table" (table $timport$0 1 1 funcref))

;; CHECK-BIN-NODEBUG: (import "env" "table2" (table $timport$1 1 1 anyref))

;; CHECK-BIN-NODEBUG: (import "env" "table3" (table $timport$2 1 1 (ref null $0)))

;; CHECK-BIN-NODEBUG: (memory $0 0)
(memory $0 0)

;; CHECK-TEXT: (elem $0 (i32.const 0) $foo)
;; CHECK-TEXT: (elem $0 (table $timport$0) (i32.const 0) func $foo)

;; CHECK-TEXT: (func $foo (type $0)
;; CHECK-TEXT-NEXT: (nop)
;; CHECK-TEXT-NEXT: )
;; CHECK-BIN: (elem $0 (i32.const 0) $foo)
;; CHECK-BIN: (elem $0 (table $timport$0) (i32.const 0) func $foo)

;; CHECK-BIN: (func $foo (type $0)
;; CHECK-BIN-NEXT: (nop)
;; CHECK-BIN-NEXT: )
(func $foo (type $0)
(nop)
)

)
;; CHECK-BIN-NODEBUG: (elem $0 (i32.const 0) $0)
;; CHECK-BIN-NODEBUG: (elem $0 (table $timport$0) (i32.const 0) func $0)

;; CHECK-BIN-NODEBUG: (func $0 (type $0)
;; CHECK-BIN-NODEBUG-NEXT: (nop)
Expand Down