Skip to content

Fix writing of data segment names in name section #6462

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 1 commit into from
Apr 2, 2024
Merged

Fix writing of data segment names in name section #6462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/wasm/wasm-binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ void WasmBinaryWriter::writeNames() {
}

// data segment names
if (!wasm->memories.empty()) {
{
Index count = 0;
for (auto& seg : wasm->dataSegments) {
if (seg->hasExplicitName) {
Expand All @@ -1081,7 +1081,7 @@ void WasmBinaryWriter::writeNames() {
o << U32LEB(count);
for (Index i = 0; i < wasm->dataSegments.size(); i++) {
auto& seg = wasm->dataSegments[i];
if (seg->name.is()) {
if (seg->hasExplicitName) {
o << U32LEB(i);
writeEscapedName(seg->name.str);
}
Expand Down
27 changes: 27 additions & 0 deletions test/lit/basic/extended-names-passive-data-segments.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.

;; RUN: wasm-opt %s -all -o %t.text.wast -g -S
;; RUN: wasm-as %s -all -g -o %t.wasm
;; RUN: wasm-dis %t.wasm -all -o %t.bin.wast
;; RUN: wasm-as %s -all -o %t.nodebug.wasm
;; RUN: wasm-dis %t.nodebug.wasm -all -o %t.bin.nodebug.wast
;; RUN: cat %t.text.wast | filecheck %s --check-prefix=CHECK-TEXT
;; RUN: cat %t.bin.wast | filecheck %s --check-prefix=CHECK-BIN
;; RUN: cat %t.bin.nodebug.wast | filecheck %s --check-prefix=CHECK-BIN-NODEBUG

(module $foo

;; Check that passive data segment names are output even when there
;; is no declared memory
;; CHECK-TEXT: (data $passive_data "b")
;; CHECK-BIN: (data $passive_data "b")
(data $passive_data "b")
(data "c")
)
;; CHECK-TEXT: (data $1 "c")

;; CHECK-BIN: (data $1 "c")

;; CHECK-BIN-NODEBUG: (data $0 "b")

;; CHECK-BIN-NODEBUG: (data $1 "c")
7 changes: 7 additions & 0 deletions test/lit/basic/extended-names.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,30 @@

;; CHECK-TEXT: (data $passive_data "b")

;; CHECK-TEXT: (data $2 "c")

;; CHECK-TEXT: (table $t1 1 funcref)
;; CHECK-BIN: (memory $m1 1 1)

;; CHECK-BIN: (data $mydata (i32.const 0) "a")

;; CHECK-BIN: (data $passive_data "b")

;; CHECK-BIN: (data $2 "c")

;; CHECK-BIN: (table $t1 1 funcref)
(table $t1 1 funcref)
(memory $m1 1 1)
(data $mydata (i32.const 0) "a")
(data $passive_data "b")
(data "c")
)
;; CHECK-BIN-NODEBUG: (memory $0 1 1)

;; CHECK-BIN-NODEBUG: (data $0 (i32.const 0) "a")

;; CHECK-BIN-NODEBUG: (data $1 "b")

;; CHECK-BIN-NODEBUG: (data $2 "c")

;; CHECK-BIN-NODEBUG: (table $0 1 funcref)