From 35df5043764b41d7c23d15db5518cfe8becb3564 Mon Sep 17 00:00:00 2001
From: Jérôme Vouillon <jerome.vouillon@gmail.com>
Date: Tue, 2 Apr 2024 13:10:52 -0400
Subject: Fix writing of data segment names in name section (#6462)

- Output segment names even when no memory is declared.
- Only write explicit names.
---
 src/wasm/wasm-binary.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index f9a643d66..28a630c4a 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -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) {
@@ -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);
         }
-- 
cgit v1.2.3