First class Data Segments (#4733)

* Updating wasm.h/cpp for DataSegments

* Updating wasm-binary.h/cpp for DataSegments

* Removed link from Memory to DataSegments and updated module-utils, Metrics and wasm-traversal

* checking isPassive when copying data segments to know whether to construct the data segment with an offset or not

* Removing memory member var from DataSegment class as there is only one memory rn. Updated wasm-validator.cpp

* Updated wasm-interpreter

* First look at updating Passes

* Updated wasm-s-parser

* Updated files in src/ir

* Updating tools files

* Last pass on src files before building

* added visitDataSegment

* Fixing build errors

* Data segments need a name

* fixing var name

* ran clang-format

* Ensuring a name on DataSegment

* Ensuring more datasegments have names

* Adding explicit name support

* Fix fuzzing name

* Outputting data name in wasm binary only if explicit

* Checking temp dataSegments vector to validateBinary because it's the one with the segments before we processNames

* Pass on when data segment names are explicitly set

* Ran auto_update_tests.py and check.py, success all around

* Removed an errant semi-colon and corrected a counter. Everything still passes

* Linting

* Fixing processing memory names after parsed from binary

* Updating the test from the last fix

* Correcting error comment

* Impl kripken@ comments

* Impl tlively@ comments

* Updated tests that remove data print when == 0

* Ran clang format

* Impl tlively@ comments

* Ran clang-format

1 files changed, 15 insertions, 15 deletions

diff --git a/src/wasm2js.h b/src/wasm2js.h
index b74572cfe..5b98362ad 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -94,8 +94,8 @@ bool isTableExported(Module& wasm) {
 }
 
 bool hasActiveSegments(Module& wasm) {
-  for (Index i = 0; i < wasm.memory.segments.size(); i++) {
-    if (!wasm.memory.segments[i].isPassive) {
+  for (Index i = 0; i < wasm.dataSegments.size(); i++) {
+    if (!wasm.dataSegments[i]->isPassive) {
       return true;
     }
   }
@@ -2665,13 +2665,13 @@ void Wasm2JSGlue::emitMemory() {
 
   // If there are no memory segments, we don't need to emit any support code for
   // segment creation.
-  if ((!wasm.memory.exists) || wasm.memory.segments.empty()) {
+  if ((!wasm.memory.exists) || wasm.dataSegments.empty()) {
     return;
   }
 
   // If we have passive memory segments, we need to store those.
-  for (auto& seg : wasm.memory.segments) {
-    if (seg.isPassive) {
+  for (auto& seg : wasm.dataSegments) {
+    if (seg->isPassive) {
       out << "  var memorySegments = {};\n";
       break;
     }
@@ -2706,20 +2706,20 @@ void Wasm2JSGlue::emitMemory() {
   }
 )";
 
-  for (Index i = 0; i < wasm.memory.segments.size(); i++) {
-    auto& seg = wasm.memory.segments[i];
-    if (seg.isPassive) {
+  for (Index i = 0; i < wasm.dataSegments.size(); i++) {
+    auto& seg = wasm.dataSegments[i];
+    if (seg->isPassive) {
       // Fancy passive segments are decoded into typed arrays on the side, for
       // later copying.
       out << "memorySegments[" << i
           << "] = base64DecodeToExistingUint8Array(new Uint8Array("
-          << seg.data.size() << ")"
-          << ", 0, \"" << base64Encode(seg.data) << "\");\n";
+          << seg->data.size() << ")"
+          << ", 0, \"" << base64Encode(seg->data) << "\");\n";
     }
   }
 
   if (hasActiveSegments(wasm)) {
-    auto globalOffset = [&](const Memory::Segment& segment) {
+    auto globalOffset = [&](const DataSegment& segment) {
       if (auto* c = segment.offset->dynCast<Const>()) {
         return std::to_string(c->value.getInteger());
       }
@@ -2732,12 +2732,12 @@ void Wasm2JSGlue::emitMemory() {
     };
 
     out << "function initActiveSegments(imports) {\n";
-    for (Index i = 0; i < wasm.memory.segments.size(); i++) {
-      auto& seg = wasm.memory.segments[i];
-      if (!seg.isPassive) {
+    for (Index i = 0; i < wasm.dataSegments.size(); i++) {
+      auto& seg = wasm.dataSegments[i];
+      if (!seg->isPassive) {
         // Plain active segments are decoded directly into the main memory.
         out << "  base64DecodeToExistingUint8Array(bufferView, "
-            << globalOffset(seg) << ", \"" << base64Encode(seg.data)
+            << globalOffset(*seg) << ", \"" << base64Encode(seg->data)
             << "\");\n";
       }
     }