From 0dba0860e1b285292acdb3e9db6bcd9c102750a6 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 29 Aug 2022 12:54:18 -0700
Subject: [NFC] Simplify binary reading logic for element segments (#4989)

Similar to #4969 but for element segments.
---
 src/wasm-binary.h        |  4 ----
 src/wasm/wasm-binary.cpp | 11 ++++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 562196580..2359d53bf 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1526,10 +1526,6 @@ public:
 
   std::map<Index, Name> elemTables;
 
-  // we store elems here after being read from binary, until when we know their
-  // names
-  std::vector<std::unique_ptr<ElementSegment>> elementSegments;
-
   // at index i we have all references to the memory i
   std::map<Index, std::vector<wasm::Name*>> memoryRefs;
 
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index d449d4bdb..baff0d83f 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -2977,9 +2977,6 @@ void WasmBinaryBuilder::validateBinary() {
 }
 
 void WasmBinaryBuilder::processNames() {
-  for (auto& segment : elementSegments) {
-    wasm.addElementSegment(std::move(segment));
-  }
   for (auto& segment : dataSegments) {
     wasm.addDataSegment(std::move(segment));
   }
@@ -3178,7 +3175,7 @@ void WasmBinaryBuilder::readElementSegments() {
       }
     }
 
-    elementSegments.push_back(std::move(segment));
+    wasm.addElementSegment(std::move(segment));
   }
 }
 
@@ -3348,7 +3345,7 @@ void WasmBinaryBuilder::readNames(size_t payloadLen) {
 
         if (index < wasm.tables.size()) {
           auto* table = wasm.tables[index].get();
-          for (auto& segment : elementSegments) {
+          for (auto& segment : wasm.elementSegments) {
             if (segment->table == table->name) {
               segment->table = name;
             }
@@ -3369,8 +3366,8 @@ void WasmBinaryBuilder::readNames(size_t payloadLen) {
         auto rawName = getInlineString();
         auto name = processor.process(rawName);
 
-        if (index < elementSegments.size()) {
-          elementSegments[index]->setExplicitName(name);
+        if (index < wasm.elementSegments.size()) {
+          wasm.elementSegments[index]->setExplicitName(name);
         } else {
           std::cerr << "warning: elem index out of bounds in name section, "
                        "elem subsection: "
-- 
cgit v1.2.3