Debug info handling for new EH try-catch

src/passes/Print.cpp

@@ -1890,6 +1890,21 @@ struct PrintSExpression : public OverriddenVisitor<PrintSExpression> {
     }
   }
 
+  // Prints debug info for a delimiter in an expression.
+  void printDebugDelimiterLocation(Expression* curr, Index i) {
+    if (currFunction && debugInfo) {
+      auto iter = currFunction->delimiterLocations.find(curr);
+      if (iter != currFunction->delimiterLocations.end()) {
+        auto& locations = iter->second;
+        Colors::grey(o);
+        o << ";; code offset: 0x" << std::hex << locations[i] << std::dec
+          << '\n';
+        restoreNormalColor(o);
+        doIndent(o, indent);
+      }
+    }
+  }
+
   void visit(Expression* curr) {
     printDebugLocation(curr);
     OverriddenVisitor<PrintSExpression>::visit(curr);
@@ -2008,6 +2023,10 @@ struct PrintSExpression : public OverriddenVisitor<PrintSExpression> {
     printFullLine(curr->condition);
     maybePrintImplicitBlock(curr->ifTrue, false);
     if (curr->ifFalse) {
+      // Note: debug info here is not used as LLVM does not emit ifs, and since
+      // LLVM is the main source of DWARF, effectively we never encounter ifs
+      // with DWARF.
+      printDebugDelimiterLocation(curr, BinaryLocations::Else);
       maybePrintImplicitBlock(curr->ifFalse, false);
     }
     decIndent();
@@ -2368,6 +2387,7 @@ struct PrintSExpression : public OverriddenVisitor<PrintSExpression> {
     o << "\n";
     for (size_t i = 0; i < curr->catchEvents.size(); i++) {
       doIndent(o, indent);
+      printDebugDelimiterLocation(curr, i);
       o << "(catch ";
       printName(curr->catchEvents[i], o);
       incIndent();
@@ -2377,6 +2397,7 @@ struct PrintSExpression : public OverriddenVisitor<PrintSExpression> {
     }
     if (curr->hasCatchAll()) {
       doIndent(o, indent);
+      printDebugDelimiterLocation(curr, curr->catchEvents.size());
       o << "(catch_all";
       incIndent();
       maybePrintImplicitBlock(curr->catchBodies.back(), true);

src/wasm/wasm-binary.cpp

@@ -2837,8 +2837,9 @@ BinaryConsts::ASTNodes WasmBinaryBuilder::readExpression(Expression*& curr) {
           startPos - codeSectionLocation;
       }
       break;
-    case BinaryConsts::Catch:
-    case BinaryConsts::CatchAll: {
+    case BinaryConsts::Catch: {
+      // TODO: add CatchAll, but the value of the constant is identical to Else
+      // case BinaryConsts::CatchAll: {
       curr = nullptr;
       if (DWARF && currFunction) {
         assert(!controlFlowStack.empty());