https://github.com/WebAssembly/binaryen/pull/3574

Author: kripken

src/wasm-binary.h

@@ -1026,7 +1026,7 @@ enum ASTNodes {
 
   Try = 0x06,
   Catch = 0x07,
-  CatchAll = 0x05,
+  CatchAll = 0x19,
   Delegate = 0x18,
   Throw = 0x08,
   Rethrow = 0x09,
@@ -1617,4 +1617,4 @@ class WasmBinaryBuilder {
 
 #undef DEBUG_TYPE
 
-#endif // wasm_wasm_binary_h
+#endif // wasm_wasm_binary_h

src/wasm/wasm-binary.cpp

@@ -2967,16 +2967,13 @@ BinaryConsts::ASTNodes WasmBinaryBuilder::readExpression(Expression*& curr) {
       }
       break;
     case BinaryConsts::Else:
-    case BinaryConsts::Catch: {
+    case BinaryConsts::Catch:
+    case BinaryConsts::CatchAll: {
       curr = nullptr;
       if (DWARF && currFunction) {
         assert(!controlFlowStack.empty());
         auto currControlFlow = controlFlowStack.back();
         BinaryLocation delimiterId;
-        // Else and CatchAll have the same binary ID, so differentiate them
-        // using the control flow stack.
-        static_assert(BinaryConsts::CatchAll == BinaryConsts::Else,
-                      "Else and CatchAll should have identical codes");
         if (currControlFlow->is<If>()) {
           delimiterId = BinaryLocations::Else;
         } else {