Support new dylink.0 custom section format

See also:
llvm change: https://reviews.llvm.org/D109595
wabt change: WebAssembly/wabt#1707

Author: sbc100

src/wasm-binary.h

@@ -403,6 +403,7 @@ namespace UserSections {
 extern const char* Name;
 extern const char* SourceMapUrl;
 extern const char* Dylink;
+extern const char* Dylink0;
 extern const char* Linking;
 extern const char* Producers;
 extern const char* TargetFeatures;
@@ -435,7 +436,10 @@ enum Subsection {
   NameElem = 8,
   NameData = 9,
   // see: https://github.com/WebAssembly/gc/issues/193
-  NameField = 10
+  NameField = 10,
+
+  DylinkMemInfo = 1,
+  DylinkNeeded = 2,
 };
 
 } // namespace UserSections
@@ -1556,6 +1560,7 @@ class WasmBinaryBuilder {
   void readNames(size_t);
   void readFeatures(size_t);
   void readDylink(size_t);
+  void readDylink0(size_t);
 
   // Debug information reading helpers
   void setDebugLocations(std::istream* sourceMap_) { sourceMap = sourceMap_; }

src/wasm/wasm-binary.cpp

@@ -1073,17 +1073,23 @@ void WasmBinaryWriter::writeDylinkSection() {
   }
 
   auto start = startSection(BinaryConsts::User);
-  writeInlineString(BinaryConsts::UserSections::Dylink);
+  writeInlineString(BinaryConsts::UserSections::Dylink0);
+
+  auto substart = startSubsection(BinaryConsts::UserSections::Subsection::DylinkMemInfo);
   o << U32LEB(wasm->dylinkSection->memorySize);
   o << U32LEB(wasm->dylinkSection->memoryAlignment);
   o << U32LEB(wasm->dylinkSection->tableSize);
   o << U32LEB(wasm->dylinkSection->tableAlignment);
-  o << U32LEB(wasm->dylinkSection->neededDynlibs.size());
-  for (auto& neededDynlib : wasm->dylinkSection->neededDynlibs) {
-    writeInlineString(neededDynlib.c_str());
-  }
+  finishSubsection(substart);
 
-  writeData(wasm->dylinkSection->tail.data(), wasm->dylinkSection->tail.size());
+  if (wasm->dylinkSection->neededDynlibs.size()) {
+    substart = startSubsection(BinaryConsts::UserSections::Subsection::DylinkNeeded);
+    o << U32LEB(wasm->dylinkSection->neededDynlibs.size());
+    for (auto& neededDynlib : wasm->dylinkSection->neededDynlibs) {
+      writeInlineString(neededDynlib.c_str());
+    }
+    finishSubsection(substart);
+  }
 
   finishSection(start);
 }
@@ -1435,6 +1441,7 @@ void WasmBinaryBuilder::read() {
 }
 
 void WasmBinaryBuilder::readUserSection(size_t payloadLen) {
+  BYN_TRACE("== readUserSection\n");
   auto oldPos = pos;
   Name sectionName = getInlineString();
   size_t read = pos - oldPos;
@@ -1452,6 +1459,8 @@ void WasmBinaryBuilder::readUserSection(size_t payloadLen) {
     readFeatures(payloadLen);
   } else if (sectionName.equals(BinaryConsts::UserSections::Dylink)) {
     readDylink(payloadLen);
+  } else if (sectionName.equals(BinaryConsts::UserSections::Dylink0)) {
+    readDylink0(payloadLen);
   } else {
     // an unfamiliar custom section
     if (sectionName.equals(BinaryConsts::UserSections::Linking)) {
@@ -3250,8 +3259,6 @@ void WasmBinaryBuilder::readFeatures(size_t payloadLen) {
 void WasmBinaryBuilder::readDylink(size_t payloadLen) {
   wasm.dylinkSection = make_unique<DylinkSection>();
 
-  auto sectionPos = pos;
-
   wasm.dylinkSection->memorySize = getU32LEB();
   wasm.dylinkSection->memoryAlignment = getU32LEB();
   wasm.dylinkSection->tableSize = getU32LEB();
@@ -3261,13 +3268,46 @@ void WasmBinaryBuilder::readDylink(size_t payloadLen) {
   for (size_t i = 0; i < numNeededDynlibs; ++i) {
     wasm.dylinkSection->neededDynlibs.push_back(getInlineString());
   }
+}
+
+void WasmBinaryBuilder::readDylink0(size_t payloadLen) {
+  BYN_TRACE("== readDylink0\n");
+  auto sectionPos = pos;
+  uint32_t lastType = 0;
 
-  size_t remaining = (sectionPos + payloadLen) - pos;
-  auto tail = getByteView(remaining);
-  wasm.dylinkSection->tail = {tail.first, tail.second};
+  wasm.dylinkSection = make_unique<DylinkSection>();
+  while (pos < sectionPos + payloadLen) {
+    auto dylinkType = getU32LEB();
+    if (lastType && dylinkType <= lastType) {
+      std::cerr << "warning: out-of-order dylink.0 subsection: " << dylinkType
+                << std::endl;
+    }
+    lastType = dylinkType;
+    auto subsectionSize = getU32LEB();
+    auto subsectionPos = pos;
+    if (dylinkType == BinaryConsts::UserSections::Subsection::DylinkMemInfo) {
+      wasm.dylinkSection->memorySize = getU32LEB();
+      wasm.dylinkSection->memoryAlignment = getU32LEB();
+      wasm.dylinkSection->tableSize = getU32LEB();
+      wasm.dylinkSection->tableAlignment = getU32LEB();
+    } else if (dylinkType ==
+               BinaryConsts::UserSections::Subsection::DylinkNeeded) {
+      size_t numNeededDynlibs = getU32LEB();
+      for (size_t i = 0; i < numNeededDynlibs; ++i) {
+        wasm.dylinkSection->neededDynlibs.push_back(getInlineString());
+      }
+    } else {
+      std::cerr << "warning: unknown name subsection with id "
+                << std::to_string(dylinkType) << " at " << pos << std::endl;
+      pos = subsectionPos + subsectionSize;
+    }
+    if (pos != subsectionPos + subsectionSize) {
+      throwError("bad dylink.0 subsection position change");
+    }
+  }
 
   if (pos != sectionPos + payloadLen) {
-    throwError("bad features section size");
+    throwError("bad dylink.0 section size");
   }
 }
 

src/wasm/wasm.cpp

@@ -31,6 +31,7 @@ namespace UserSections {
 const char* Name = "name";
 const char* SourceMapUrl = "sourceMappingURL";
 const char* Dylink = "dylink";
+const char* Dylink0 = "dylink.0";
 const char* Linking = "linking";
 const char* Producers = "producers";
 const char* TargetFeatures = "target_features";