Stack IR

Author: vouillon

src/wasm/wasm-stack.cpp

@@ -2839,8 +2839,13 @@ void StackIRToBinaryWriter::write() {
         WASM_UNREACHABLE("unexpected op");
     }
   }
+  // Indicate the debug location corresponding to the end opcode that
+  // terminates the function code.
   if (func->epilogLocation.size()) {
     parent.writeDebugLocation(*func->epilogLocation.begin());
+  } else {
+    // The end opcode has no debug location.
+    parent.writeNoDebugLocation();
   }
   writer.emitFunctionEnd();
 }

test/lit/debug/source-map-smearing.wast

@@ -2,6 +2,12 @@
 ;; RUN: echo >> %t.wasm.map
 ;; RUN: cat %t.wasm.map | filecheck %s
 
+;; Also test with StackIR, which should have identical results.
+;;
+;; RUN: wasm-opt %s --generate-stack-ir -o %t.wasm -osm %t.map -g -q
+;; RUN: echo >> %t.wasm.map
+;; RUN: cat %t.wasm.map | filecheck %s
+
 ;; Check that the debug locations do not smear beyond a function
 ;; epilogue to the next function. The encoded segment 'C' means that
 ;; the previous segment is indeed one-byte long.

test/lit/debug/source-map-stop.wast

@@ -3,6 +3,11 @@
 ;; RUN: wasm-opt %s -g -o %t.wasm -osm %t.wasm.map
 ;; RUN: wasm-opt %t.wasm -ism %t.wasm.map -S -o - | filecheck %s
 
+;; Also test with StackIR, which should have identical results.
+;;
+;; RUN: wasm-opt %s --generate-stack-ir -o %t.wasm -osm %t.map -g -q
+;; RUN: wasm-opt %t.wasm -ism %t.map -q -o - -S | filecheck %s
+
 ;; Verify that writing to a source map and reading it back does not "smear"
 ;; debug info across adjacent instructions. The debug info in the output should
 ;; be identical to the input.