debuginfo experiment

Author: dschuff

src/tools/asm2wasm.cpp

@@ -133,7 +133,7 @@ int main(int argc, const char *argv[]) {
 
   Asm2WasmPreProcessor pre;
   // wasm binaries can contain a names section, but not full debug info
-  pre.debugInfo = passOptions.debugInfo && !emitBinary;
+  pre.debugInfo = passOptions.debugInfo;
   auto input(
       read_file<std::vector<char>>(options.extra["infile"], Flags::Text, options.debug ? Flags::Debug : Flags::Release));
   char *start = pre.process(input.data());

src/wasm-binary.h

@@ -534,6 +534,7 @@ inline S32LEB binaryWasmType(WasmType type) {
 class WasmBinaryWriter : public Visitor<WasmBinaryWriter, void> {
   Module* wasm;
   BufferWithRandomAccess& o;
+  Function* currFunction = nullptr;
   bool debug;
   bool debugInfo = true;
   std::string symbolMap;
@@ -607,6 +608,19 @@ class WasmBinaryWriter : public Visitor<WasmBinaryWriter, void> {
   void recurse(Expression*& curr);
   std::vector<Name> breakStack;
 
+  void visit(Expression* curr) {
+    if (debugInfo && currFunction) {
+      // show an annotation, if there is one
+      auto& debugLocations = currFunction->debugLocations;
+      auto iter = debugLocations.find(curr);
+      if (iter != debugLocations.end()) {
+        auto fileName = wasm->debugInfoFileNames[iter->second.fileIndex];
+        std::cout << std::hex <<o.size() << ":" << fileName << ":" << std::dec <<iter->second.lineNumber << '\n';
+      }
+    }
+    Visitor<WasmBinaryWriter>::visit(curr);
+  }
+
   void visitBlock(Block *curr);
   // emits a node, but if it is a block with no name, emit a list of its contents
   void recursePossibleBlockContents(Expression* curr);

src/wasm/wasm-binary.cpp

@@ -236,6 +236,7 @@ void WasmBinaryWriter::writeFunctions() {
     size_t sizePos = writeU32LEBPlaceholder();
     size_t start = o.size();
     Function* function = wasm->functions[i].get();
+    currFunction = function;
     mappedLocals.clear();
     numLocalsByType.clear();
     if (debug) std::cerr << "writing" << function->name << std::endl;
@@ -258,6 +259,7 @@ void WasmBinaryWriter::writeFunctions() {
     if (debug) std::cerr << "body size: " << size << ", writing at " << sizePos << ", next starts at " << o.size() << std::endl;
     o.writeAt(sizePos, U32LEB(size));
   }
+  currFunction = nullptr;
   finishSection(start);
 }