does you work

Author: ashleynh

src/wasm-ir-builder.h

@@ -399,12 +399,8 @@ class IRBuilder : public UnifiedExpressionVisitor<IRBuilder, Result<>> {
     static ScopeCtx makeTry(Try* tryy, Name originalLabel, Type inputType) {
       return ScopeCtx(TryScope{tryy, originalLabel}, inputType);
     }
-    static ScopeCtx
-    makeCatch(Try* tryy, Name originalLabel, Index index, Name label) {
-      return ScopeCtx(CatchScope{tryy, originalLabel, index}, label);
-    }
-    static ScopeCtx makeCatch(ScopeCtx&& scope, Try* tryy) {
-      scope.scope = CatchScope{tryy, scope.getOriginalLabel()};
+    static ScopeCtx makeCatch(ScopeCtx&& scope, Try* tryy, Index index) {
+      scope.scope = CatchScope{tryy, scope.getOriginalLabel(), index};
       scope.resetForDelimiter(/*keepInput=*/false);
       return scope;
     }

src/wasm/wasm-ir-builder.cpp

@@ -964,7 +964,7 @@ Result<> IRBuilder::visitCatch(Name tag) {
     delimiterLocs[delimiterLocs.size()] = lastBinaryPos - codeSectionOffset;
   }
 
-  CHECK_ERR(pushScope(ScopeCtx::makeCatch(tryy, originalLabel, index, label)));
+  CHECK_ERR(pushScope(ScopeCtx::makeCatch(std::move(scope), tryy, index)));
   // Push a pop for the exception payload if necessary.
   auto params = wasm.getTag(tag)->params();
   if (params != Type::none) {
@@ -1147,6 +1147,8 @@ Result<> IRBuilder::visitEnd() {
       tryy->catchBodies.resize(index + 1);
     }
     tryy->catchBodies[index] = *expr;
+    tryy->finalize(tryy->type);
+    push(maybeWrapForLabel(tryy));
   } else if (auto* trytable = scope.getTryTable()) {
     trytable->body = *expr;
     trytable->finalize(trytable->type, &wasm);