Fix: remove excess optimization for sourcemap

WebAssembly · Mar 6, 2023 · cd260b6 · cd260b6
1 parent 661fe5e
commit cd260b6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -2521,7 +2521,6 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
 
   Module* currModule = nullptr;
   Function* currFunction = nullptr;
-  Function::DebugLocation lastPrintedLocation;
   bool debugInfo;
 
   // Used to print delegate's depth argument when it throws to the caller
@@ -2535,10 +2534,6 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
   }
 
   void printDebugLocation(const Function::DebugLocation& location) {
-    if (lastPrintedLocation == location) {
-      return;
-    }
-    lastPrintedLocation = location;
     auto fileName = currModule->debugInfoFileNames[location.fileIndex];
     o << ";;@ " << fileName << ":" << location.lineNumber << ":"
       << location.columnNumber << '\n';
@@ -3100,7 +3095,6 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
   void visitImportedFunction(Function* curr) {
     doIndent(o, indent);
     currFunction = curr;
-    lastPrintedLocation = {0, 0, 0};
     o << '(';
     emitImportHeader(curr);
     handleSignature(curr->getSig(), curr->name);
@@ -3110,7 +3104,6 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
   void visitDefinedFunction(Function* curr) {
     doIndent(o, indent);
     currFunction = curr;
-    lastPrintedLocation = {0, 0, 0};
     if (currFunction->prologLocation.size()) {
       printDebugLocation(*currFunction->prologLocation.begin());
     }
@@ -3168,8 +3161,7 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
       // Print the stack IR.
       printStackIR(curr->stackIR.get(), o, curr);
     }
-    if (currFunction->epilogLocation.size() &&
-        lastPrintedLocation != *currFunction->epilogLocation.begin()) {
+    if (currFunction->epilogLocation.size()) {
       // Print last debug location: mix of decIndent and printDebugLocation
       // logic.
       doIndent(o, indent);

diff --git a/src/wasm-binary.h b/src/wasm-binary.h
@@ -1341,7 +1341,6 @@ class WasmBinaryWriter {
   void writeDylinkSection();
   void writeLegacyDylinkSection();
 
-  void initializeDebugInfo();
   void writeSourceMapProlog();
   void writeSourceMapEpilog();
   void writeDebugLocation(const Function::DebugLocation& loc);
@@ -1402,7 +1401,6 @@ class WasmBinaryWriter {
   std::vector<std::pair<size_t, const Function::DebugLocation*>>
     sourceMapLocations;
   size_t sourceMapLocationsSizeAtSectionStart;
-  Function::DebugLocation lastDebugLocation;
 
   std::unique_ptr<ImportInfo> importInfo;
 

diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -43,7 +43,6 @@ void WasmBinaryWriter::write() {
 
   writeDylinkSection();
 
-  initializeDebugInfo();
   if (sourceMap) {
     writeSourceMapProlog();
   }
@@ -1117,10 +1116,6 @@ void WasmBinaryWriter::writeSymbolMap() {
   file.close();
 }
 
-void WasmBinaryWriter::initializeDebugInfo() {
-  lastDebugLocation = {0, /* lineNumber = */ 1, 0};
-}
-
 void WasmBinaryWriter::writeSourceMapProlog() {
   *sourceMap << "{\"version\":3,\"sources\":[";
   for (size_t i = 0; i < wasm->debugInfoFileNames.size(); i++) {
@@ -1301,12 +1296,8 @@ void WasmBinaryWriter::writeDylinkSection() {
 }
 
 void WasmBinaryWriter::writeDebugLocation(const Function::DebugLocation& loc) {
-  if (loc == lastDebugLocation) {
-    return;
-  }
   auto offset = o.size();
   sourceMapLocations.emplace_back(offset, &loc);
-  lastDebugLocation = loc;
 }
 
 void WasmBinaryWriter::writeDebugLocation(Expression* curr, Function* func) {

diff --git a/test/lit/source-map.wast b/test/lit/source-map.wast
@@ -22,6 +22,13 @@
       ;;@ src.cpp:80:1
       (local.get $y)
     )
+    ;;@ src.cpp:90:1
+    (call $foo
+      ;;@ src.cpp:90:1
+      (local.get $x)
+      ;;@ src.cpp:90:1
+      (local.get $y)
+    )
   )
 )
 
@@ -45,3 +52,10 @@
 ;; CHECK-NEXT:    ;;@ src.cpp:80:1
 ;; CHECK-NEXT:    (local.get $y)
 ;; CHECK-NEXT:   )
+;; CHECK-NEXT:   ;;@ src.cpp:90:1
+;; CHECK-NEXT:   (call $foo
+;; CHECK-NEXT:    ;;@ src.cpp:90:1
+;; CHECK-NEXT:    (local.get $x)
+;; CHECK-NEXT:    ;;@ src.cpp:90:1
+;; CHECK-NEXT:    (local.get $y)
+;; CHECK-NEXT:   )