Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/wasm/wasm-binary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3354,7 +3354,11 @@ void WasmBinaryReader::readElementSegments() {
[[maybe_unused]] auto type = getU32LEB();
auto num = getU32LEB();
for (Index i = 0; i < num; i++) {
getU32LEB();
if (usesExpressions) {
readExpression();
} else {
getU32LEB();
}
}
continue;
}
Expand Down
28 changes: 28 additions & 0 deletions test/lit/binary/declarative-element-use-expr.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
;; Verify a binary with declarative element segment whose init is vector of expr
;; can be parsed correctly.
;; The declarative-element-use-expr file contains this:
;;
;; (module
;; (type $0 (func))
;; (func $0 (type 0) (block (ref.func 0) (drop)))
;; (elem $0 declare funcref (item ref.func 0))
;; )
;;
;; The wasm-opt output contains `(elem declare func 0)` instead of
;; `(elem declare funcref (item ref.func 0))` because the parser doesn't
;; preserve declarative segments. This is fine, as we test that the
;; binary parser can parse it correctly.

;; RUN: wasm-opt -all %s.wasm -all --print | filecheck %s

;; CHECK: (module
;; CHECK-NEXT: (type $0 (func))
;; CHECK-NEXT: (elem declare func $0)
;; CHECK-NEXT: (func $0 (type $0)
;; CHECK-NEXT: (block $label$1
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.func $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
Binary file not shown.