Skip to content

Interpreter: Fix delegate through try_table #9234

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 1 commit into from
Oct 8, 2026
Merged

Interpreter: Fix delegate through try_table #9234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4963,6 +4963,12 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
try {
return self()->visit(curr->body);
} catch (const WasmException& e) {
// If delegation is in progress, try_table cannot be the target of a
// legacy try-delegate, so don't handle it and just rethrow.
if (scope->currDelegateTarget.is()) {
throw;
}

auto exnData = e.exn.getExnData();
for (size_t i = 0; i < curr->catchTags.size(); i++) {
auto catchTag = curr->catchTags[i];
Expand Down
48 changes: 48 additions & 0 deletions test/lit/exec/eh-legacy.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,46 @@
)
)
)

;; CHECK: [fuzz-exec] export try-delegate-caller-through-try_table
;; CHECK-NEXT: [exception thrown: e-i32 5]
(func $try-delegate-caller-through-try_table (export "try-delegate-caller-through-try_table")
;; Delegation to the caller should bypass an intermediate try_table.
(block $catch
(try_table (catch_all $catch)
(try
(do
(throw $e-i32 (i32.const 5))
)
(delegate 1)
)
)
)
)

;; CHECK: [fuzz-exec] export try-delegate-try-through-try_table
;; CHECK-NEXT: [fuzz-exec] note result: try-delegate-try-through-try_table => 6
(func $try-delegate-try-through-try_table (export "try-delegate-try-through-try_table") (result i32)
;; Delegation to an outer try should also bypass an intermediate try_table.
(try $l0 (result i32)
(do
(block $catch
(try_table (catch_all $catch)
(try
(do
(throw $e-i32 (i32.const 6))
)
(delegate $l0)
)
)
)
(i32.const 0)
)
(catch $e-i32
(pop i32)
)
)
)
)
;; CHECK: [fuzz-exec] export throw
;; CHECK-NEXT: [exception thrown: e-i32 1]
Expand All @@ -58,7 +98,15 @@

;; CHECK: [fuzz-exec] export try-delegate
;; CHECK-NEXT: [exception thrown: e-i32 4]

;; CHECK: [fuzz-exec] export try-delegate-caller-through-try_table
;; CHECK-NEXT: [exception thrown: e-i32 5]

;; CHECK: [fuzz-exec] export try-delegate-try-through-try_table
;; CHECK-NEXT: [fuzz-exec] note result: try-delegate-try-through-try_table => 6
;; CHECK-NEXT: [fuzz-exec] comparing catchless-try
;; CHECK-NEXT: [fuzz-exec] comparing throw
;; CHECK-NEXT: [fuzz-exec] comparing try-catch
;; CHECK-NEXT: [fuzz-exec] comparing try-delegate
;; CHECK-NEXT: [fuzz-exec] comparing try-delegate-caller-through-try_table
;; CHECK-NEXT: [fuzz-exec] comparing try-delegate-try-through-try_table
Loading