Skip to content

Fix block-nested Pop in GUFA #8747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlively merged 6 commits into from
May 22, 2026
+63 −5
Merged

Fix block-nested Pop in GUFA #8747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfd46ac
Fix block-nested Pop in GUFA
tlively May 21, 2026
5a12788
Merge branch 'main' into fix-gufa-pop-validation
tlively May 22, 2026
7999f16
Merge branch 'main' into fix-gufa-pop-validation
tlively May 22, 2026
0b1aaf6
Merge branch 'main' into fix-gufa-pop-validation
tlively May 22, 2026
fcdec45
Merge branch 'main' into fix-gufa-pop-validation
tlively May 22, 2026
943c995
always do optimized=true in replaceCurrent
tlively May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/passes/GUFA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ struct GUFAOptimizer
std::unordered_map<Expression*, PossibleContents> newContents;

Expression* replaceCurrent(Expression* rep) {
optimized = true;
newContents[rep] = oracle.getContents(getCurrent());

return WalkerPass<
PostWalker<GUFAOptimizer,
UnifiedExpressionVisitor<GUFAOptimizer>>>::replaceCurrent(rep);
Expand Down Expand Up @@ -140,7 +140,6 @@ struct GUFAOptimizer
// code.
replaceCurrent(getDroppedChildrenAndAppend(
curr, wasm, options, builder.makeUnreachable()));
optimized = true;
return;
}

Expand Down Expand Up @@ -169,7 +168,6 @@ struct GUFAOptimizer
// valid here.
if (Type::isSubType(c->type, curr->type)) {
replaceCurrent(getDroppedChildrenAndAppend(curr, wasm, options, c));
optimized = true;
} else {
// The type is not compatible: we cannot place |c| in this location, even
// though we have proven it is the only value possible here.
Expand Down Expand Up @@ -214,7 +212,6 @@ struct GUFAOptimizer
assert(Properties::isConstantExpression(c));
replaceCurrent(getDroppedChildrenAndAppend(
curr, wasm, options, builder.makeUnreachable()));
optimized = true;
}
}
}
Expand Down Expand Up @@ -391,7 +388,6 @@ struct GUFAOptimizer
if (oracleType.isRef() && oracleType != curr->type &&
Type::isSubType(oracleType, curr->type)) {
replaceCurrent(Builder(*getModule()).makeRefCast(curr, oracleType));
optimized = true;
}
}
};
Expand Down
62 changes: 62 additions & 0 deletions test/lit/passes/gufa-cast-all.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,65 @@
)
)


;; Regression test for bug where optimizing expressions containing a Pop could
;; result in the Pop becoming invalidly nested inside a Block (created to
;; preserve side effects), and the optimizer failed to run the nested pop fixup
;; because it didn't mark the function as optimized.
(module
;; CHECK: (type $array (sub (array anyref)))
(type $array (sub (array (ref null any))))
;; CHECK: (type $tag-sig (func (param (ref null $array))))
(type $tag-sig (func (param (ref null $array))))
;; CHECK: (type $2 (func))

;; CHECK: (tag $tag (type $tag-sig) (param (ref null $array)))
(tag $tag (type $tag-sig) (param (ref null $array)))

;; CHECK: (func $test (type $2)
;; CHECK-NEXT: (local $0 (ref null $array))
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (try (result (ref i31))
;; CHECK-NEXT: (do
;; CHECK-NEXT: (ref.i31
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (catch $tag
;; CHECK-NEXT: (local.set $0
;; CHECK-NEXT: (pop (ref null $array))
;; CHECK-NEXT: )
;; CHECK-NEXT: (ref.i31
;; CHECK-NEXT: (block (result i32)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $test
(drop
(try (result (ref i31))
(do
;; This doesn't throw, so everything in the catch is unreachable.
(ref.i31 (i32.const 0))
)
(catch $tag
(ref.i31
(ref.eq
(pop (ref null $array))
(ref.i31 (i32.const 0))
)
)
)
)
)
)
)
Loading