Fixup block-nested pops even when EH is not enabled (#7130)

While parsing a binary file, there may be pops that need to be fixed up
even if EH is not (yet) enabled because the target features section has
not been parsed yet. Previously `EHUtils::handleBlockNestedPops` did not
do anything if EH was not enabled, so the binary parser would fail to
fix up pops in that case. Add an optional parameter to override this
behavior so the parser can fix up pops unconditionally.

Fixes #7127.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp
index fcb1fc48d..a51337cda 100644
--- a/src/wasm/wasm-ir-builder.cpp
+++ b/src/wasm/wasm-ir-builder.cpp
@@ -1018,7 +1018,10 @@ Result<> IRBuilder::visitEnd() {
     func->body = maybeWrapForLabel(*expr);
     labelDepths.clear();
     if (scope.needsPopFixup()) {
-      EHUtils::handleBlockNestedPops(func, wasm);
+      // We may be in the binary parser, where pops need to be fixed up before
+      // we know that EH will be enabled.
+      EHUtils::handleBlockNestedPops(
+        func, wasm, EHUtils::FeaturePolicy::RunIfNoEH);
     }
     this->func = nullptr;
     blockHint = 0;