Implement parsing and printing

src/binaryen-c.cpp

@@ -5662,6 +5662,14 @@ void BinaryenModuleInterpret(BinaryenModuleRef module) {
   ModuleRunner instance(*(Module*)module, &interface, {});
 }
 
+BinaryenIndex BinaryenModuleAddDebugInfoSymbolName(BinaryenModuleRef module,
+                                                   const char* symbolname) {
+  auto& debugInfoSymbolNames = ((Module*)module)->debugInfoSymbolNames;
+  BinaryenIndex index = debugInfoSymbolNames.size();
+  debugInfoSymbolNames.push_back(symbolname);
+  return index;
+}
+
 BinaryenIndex BinaryenModuleAddDebugInfoFileName(BinaryenModuleRef module,
                                                  const char* filename) {
   auto& debugInfoFileNames = ((Module*)module)->debugInfoFileNames;
@@ -5670,6 +5678,14 @@ BinaryenIndex BinaryenModuleAddDebugInfoFileName(BinaryenModuleRef module,
   return index;
 }
 
+const char* BinaryenModuleGetDebugInfoSymbolName(BinaryenModuleRef module,
+                                                 BinaryenIndex index) {
+  const auto& debugInfoSymbolNames = ((Module*)module)->debugInfoSymbolNames;
+  return index < debugInfoSymbolNames.size()
+           ? debugInfoSymbolNames.at(index).c_str()
+           : nullptr;
+}
+
 const char* BinaryenModuleGetDebugInfoFileName(BinaryenModuleRef module,
                                                BinaryenIndex index) {
   const auto& debugInfoFileNames = ((Module*)module)->debugInfoFileNames;

src/ir/module-utils.cpp

@@ -181,6 +181,7 @@ void copyModuleItems(const Module& in, Module& out) {
   // to map file name indices from this modules to file name indices in
   // the target module.
   std::optional<std::vector<Index>> fileIndexMap;
+  // TODO: Update this with symbol names
   if (!in.debugInfoFileNames.empty()) {
     std::unordered_map<std::string, Index> debugInfoFileIndices;
     for (Index i = 0; i < out.debugInfoFileNames.size(); i++) {
@@ -241,6 +242,7 @@ void copyModule(const Module& in, Module& out) {
   out.start = in.start;
   out.customSections = in.customSections;
   out.debugInfoFileNames = in.debugInfoFileNames;
+  out.debugInfoSymbolNames = in.debugInfoSymbolNames;
   out.features = in.features;
 }
 

src/parser/contexts.h

@@ -1398,6 +1398,7 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> {
     typeNames;
   const std::unordered_map<Index, Index>& implicitElemIndices;
 
+  std::unordered_map<std::string_view, Index> debugSymbolNameIndices;
   std::unordered_map<std::string_view, Index> debugFileIndices;
 
   // The index of the current module element.
@@ -1783,6 +1784,18 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> {
       return;
     }
 
+    std::optional<BinaryLocation> nameIndex;
+    auto namePos = contents.find(':');
+    if (namePos != contents.npos) {
+        auto name = contents.substr(namePos + 1);
+        auto [it, inserted] =
+          debugSymbolNameIndices.insert({name, debugSymbolNameIndices.size()});
+          if (inserted) {
+            assert(wasm.debugInfoSymbolNames.size() == it->second);
+            wasm.debugInfoSymbolNames.push_back(std::string(file));
+          }
+    }
+
     // TODO: If we ever parallelize the parse, access to
     // `wasm.debugInfoFileNames` will have to be protected by a lock.
     auto [it, inserted] =

src/passes/Print.cpp

@@ -2504,7 +2504,14 @@ void PrintSExpression::printDebugLocation(
   } else {
     auto fileName = currModule->debugInfoFileNames[location->fileIndex];
     o << ";;@ " << fileName << ":" << location->lineNumber << ":"
-      << location->columnNumber << '\n';
+      << location->columnNumber;
+
+    if (location->nameIndex.has_value()) {
+        auto symbolName = currModule->debugInfoSymbolNames[*(location->nameIndex)];
+        o << ":" << symbolName;
+    }
+
+    o << '\n';
   }
   doIndent(o, indent);
 }

src/wasm-binary.h

@@ -1670,6 +1670,7 @@ class WasmBinaryReader {
   // Debug information reading helpers
   void setDebugLocations(std::istream* sourceMap_) { sourceMap = sourceMap_; }
   std::unordered_map<std::string, Index> debugInfoFileIndices;
+  std::unordered_map<std::string, Index> debugInfoSymbolNameIndices;
   void readNextDebugLocation();
   void readSourceMapHeader();
 

src/wasm.h

@@ -2297,6 +2297,7 @@ class Module {
 
   // Source maps debug info.
   std::vector<std::string> debugInfoFileNames;
+  std::vector<std::string> debugInfoSymbolNames;
 
   // `features` are the features allowed to be used in this module and should be
   // respected regardless of the value of`hasFeaturesSection`.

src/wasm/wasm-binary.cpp

@@ -1221,7 +1221,17 @@ void WasmBinaryWriter::writeSourceMapProlog() {
     // TODO respect JSON string encoding, e.g. quotes and control chars.
     *sourceMap << "\"" << wasm->debugInfoFileNames[i] << "\"";
   }
-  *sourceMap << "],\"names\":[],\"mappings\":\"";
+  *sourceMap << "],\"names\":[";
+
+  for (size_t i = 0; i < wasm->debugInfoSymbolNames.size(); i++) {
+    if (i > 0) {
+      *sourceMap << ",";
+    }
+    // TODO respect JSON string encoding, e.g. quotes and control chars.
+    *sourceMap << "\"" << wasm->debugInfoSymbolNames[i] << "\"";
+  }
+
+  *sourceMap << "],\"mappings\":\"";
 }
 
 static void writeBase64VLQ(std::ostream& out, int32_t n) {
@@ -1236,9 +1246,10 @@ static void writeBase64VLQ(std::ostream& out, int32_t n) {
     }
     // more VLG digit will follow -- add continuation bit (0x20),
     // base64 codes 'g'..'z', '0'..'9', '+', '/'
-    out << char(digit < 20
-                  ? 'g' + digit
-                  : digit < 30 ? '0' + digit - 20 : digit == 30 ? '+' : '/');
+    out << char(digit < 20    ? 'g' + digit
+                : digit < 30  ? '0' + digit - 20
+                : digit == 30 ? '+'
+                              : '/');
   }
 }
 
@@ -2886,6 +2897,21 @@ void WasmBinaryReader::readSourceMapHeader() {
     mustReadChar(']');
   }
 
+  if (findField("names")) {
+    skipWhitespace();
+    mustReadChar('[');
+    if (!maybeReadChar(']')) {
+      do {
+        std::string symbol;
+        readString(symbol);
+        Index index = wasm.debugInfoSymbolNames.size();
+        wasm.debugInfoSymbolNames.push_back(symbol);
+        debugInfoSymbolNameIndices[symbol] = index;
+      } while (maybeReadChar(','));
+      mustReadChar(']');
+    }
+  }
+
   if (!findField("mappings")) {
     throw MapParseException("cannot find the 'mappings' field in map");
   }

src/wasm/wasm.cpp

@@ -1859,6 +1859,9 @@ void Module::updateMaps() {
   assert(tagsMap.size() == tags.size());
 }
 
-void Module::clearDebugInfo() { debugInfoFileNames.clear(); }
+void Module::clearDebugInfo() {
+  debugInfoFileNames.clear();
+  debugInfoSymbolNames.clear();
+}
 
 } // namespace wasm