From beb816be810caa0b32ab37986e7cae6f6cf11b1b Mon Sep 17 00:00:00 2001
From: Thomas Lively <tlively@google.com>
Date: Tue, 21 Nov 2023 08:50:20 +0100
Subject: Fix a bug with unreachable control flow in IRBuilder (#6130)

When branches target control flow structures other than blocks or loops, the
IRBuilder wraps those control flow structures with an extra block for the
branches to target in Binaryen IR. Usually that block has the same type as the
control flow structure it wraps, but when the control flow structure is
unreachable because all its bodies are unreachable, the wrapper block may still
need to have a non-unreachable type if it is targeted by branches.

Previously the wrapper block would also be unreachable in that case. Fix the bug
by tracking whether the wrapper block will be targeted by any branches and use
the control flow structure's original, non-unreachable type if so.
---
 src/wasm-ir-builder.h        |  1 +
 src/wasm/wasm-ir-builder.cpp | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wasm-ir-builder.h b/src/wasm-ir-builder.h
index d9075952d..9b8ae043f 100644
--- a/src/wasm-ir-builder.h
+++ b/src/wasm-ir-builder.h
@@ -239,6 +239,7 @@ private:
 
     // The branch label name for this scope. Always fresh, never shadowed.
     Name label;
+    bool labelUsed = false;
 
     std::vector<Expression*> exprStack;
     // Whether we have seen an unreachable instruction and are in
diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp
index 964676ff9..dfbf156b2 100644
--- a/src/wasm/wasm-ir-builder.cpp
+++ b/src/wasm/wasm-ir-builder.cpp
@@ -584,10 +584,17 @@ Result<> IRBuilder::visitEnd() {
   CHECK_ERR(expr);
 
   // If the scope expression cannot be directly labeled, we may need to wrap it
-  // in a block.
+  // in a block. It's possible that the scope expression becomes typed
+  // unreachable when it is finalized, but if the wrapper block is targeted by
+  // any branches, the target block needs to have the original non-unreachable
+  // type of the scope expression.
+  auto originalScopeType = scope.getResultType();
   auto maybeWrapForLabel = [&](Expression* curr) -> Expression* {
     if (scope.label) {
-      return builder.makeBlock(scope.label, {curr}, scope.getResultType());
+      return builder.makeBlock(scope.label,
+                               {curr},
+                               scope.labelUsed ? originalScopeType
+                                               : scope.getResultType());
     }
     return curr;
   };
@@ -638,6 +645,7 @@ Result<Name> IRBuilder::getLabelName(Index label) {
     // The scope does not already have a name, so we need to create one.
     scopeLabel = makeFresh("label");
   }
+  (*scope)->labelUsed = true;
   return scopeLabel;
 }
 
-- 
cgit v1.2.3