Skip to content

[StackCheck] Fix handler call result type #9335

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 2 commits into from
Nov 2, 2026
Merged

[StackCheck] Fix handler call result type #9335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e810c0e
[StackCheck] Test the call to a stack overflow handler
nexxeln Nov 1, 2026
f7e74cc
[StackCheck] Fix handler call result type
nexxeln Nov 1, 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: 2 additions & 4 deletions src/passes/StackCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ struct EnforceStackLimits : public WalkerPass<PostWalker<EnforceStackLimits>> {
// Otherwise, just trap.
Expression* handlerExpr;
if (handler.is()) {
handlerExpr =
builder.makeCall(handler,
{builder.makeLocalGet(newSP, stackPointer->type)},
stackPointer->type);
handlerExpr = builder.makeCall(
handler, {builder.makeLocalGet(newSP, stackPointer->type)}, Type::none);
} else {
handlerExpr = builder.makeUnreachable();
}
Expand Down
89 changes: 89 additions & 0 deletions test/lit/passes/stack-check-memory64.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
;; NOTE: This test was ported using port_passes_tests_to_lit.py and could be cleaned up.

;; RUN: foreach %s %t wasm-opt --stack-check --enable-memory64 -S -o - | filecheck %s
;; RUN: foreach %s %t wasm-opt --stack-check --enable-memory64 --pass-arg=stack-check-handler@__handle_stack_overflow -S -o - | filecheck %s --check-prefix=HANDLER

(module
(memory i64 0 0)
Expand All @@ -10,6 +11,15 @@
;; CHECK: (type $1 (func (param i64 i64)))

;; CHECK: (global $__stack_pointer (mut i64) (i64.const 0))
;; HANDLER: (type $0 (func (result i64)))

;; HANDLER: (type $1 (func (param i64)))

;; HANDLER: (type $2 (func (param i64 i64)))

;; HANDLER: (import "env" "__handle_stack_overflow" (func $__handle_stack_overflow (param i64)))

;; HANDLER: (global $__stack_pointer (mut i64) (i64.const 0))
(global $__stack_pointer (mut i64) (i64.const 0))
;; CHECK: (global $__stack_base (mut i64) (i64.const 0))

Expand Down Expand Up @@ -47,6 +57,44 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: (global.get $__stack_pointer)
;; CHECK-NEXT: )
;; HANDLER: (global $__stack_base (mut i64) (i64.const 0))

;; HANDLER: (global $__stack_limit (mut i64) (i64.const 0))

;; HANDLER: (memory $0 i64 0 0)

;; HANDLER: (export "use_stack" (func $use_stack))

;; HANDLER: (export "__set_stack_limits" (func $__set_stack_limits))

;; HANDLER: (func $use_stack (result i64)
;; HANDLER-NEXT: (local $0 i64)
;; HANDLER-NEXT: (block
;; HANDLER-NEXT: (if
;; HANDLER-NEXT: (i32.or
;; HANDLER-NEXT: (i64.gt_u
;; HANDLER-NEXT: (local.tee $0
;; HANDLER-NEXT: (i64.const 42)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (global.get $__stack_base)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (i64.lt_u
;; HANDLER-NEXT: (local.get $0)
;; HANDLER-NEXT: (global.get $__stack_limit)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (then
;; HANDLER-NEXT: (call $__handle_stack_overflow
;; HANDLER-NEXT: (local.get $0)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (global.set $__stack_pointer
;; HANDLER-NEXT: (local.get $0)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (global.get $__stack_pointer)
;; HANDLER-NEXT: )
(func $use_stack (export "use_stack") (result i64)
(global.set $__stack_pointer (i64.const 42))
(global.get $__stack_pointer)
Expand All @@ -60,6 +108,15 @@
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; HANDLER: (func $__set_stack_limits (param $0 i64) (param $1 i64)
;; HANDLER-NEXT: (global.set $__stack_base
;; HANDLER-NEXT: (local.get $0)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (global.set $__stack_limit
;; HANDLER-NEXT: (local.get $1)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
(module
;; if the global names are taken we should not crash
(memory i64 0 0)
Expand All @@ -68,10 +125,21 @@
;; CHECK: (type $1 (func (param i64 i64)))

;; CHECK: (global $__stack_pointer (mut i64) (i64.const 0))
;; HANDLER: (type $0 (func (result i64)))

;; HANDLER: (type $1 (func (param i64)))

;; HANDLER: (type $2 (func (param i64 i64)))

;; HANDLER: (import "env" "__handle_stack_overflow" (func $__handle_stack_overflow (param i64)))

;; HANDLER: (global $__stack_pointer (mut i64) (i64.const 0))
(global $__stack_pointer (mut i64) (i64.const 0))
;; CHECK: (global $__stack_base (mut i64) (i64.const 0))
;; HANDLER: (global $__stack_base (mut i64) (i64.const 0))
(global $__stack_base (mut i64) (i64.const 0))
;; CHECK: (global $__stack_limit (mut i64) (i64.const 0))
;; HANDLER: (global $__stack_limit (mut i64) (i64.const 0))
(global $__stack_limit (mut i64) (i64.const 0))
;; CHECK: (global $__stack_base_3 (mut i64) (i64.const 0))

Expand All @@ -80,12 +148,24 @@
;; CHECK: (memory $0 i64 0 0)

;; CHECK: (export "use_stack" (func $0))
;; HANDLER: (global $__stack_base_3 (mut i64) (i64.const 0))

;; HANDLER: (global $__stack_limit_3 (mut i64) (i64.const 0))

;; HANDLER: (memory $0 i64 0 0)

;; HANDLER: (export "use_stack" (func $0))
(export "use_stack" (func $0))
;; CHECK: (export "__set_stack_limits" (func $__set_stack_limits))

;; CHECK: (func $0 (result i64)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; HANDLER: (export "__set_stack_limits" (func $__set_stack_limits))

;; HANDLER: (func $0 (result i64)
;; HANDLER-NEXT: (unreachable)
;; HANDLER-NEXT: )
(func $0 (result i64)
(unreachable)
)
Expand All @@ -98,3 +178,12 @@
;; CHECK-NEXT: (local.get $1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )

;; HANDLER: (func $__set_stack_limits (param $0 i64) (param $1 i64)
;; HANDLER-NEXT: (global.set $__stack_base_3
;; HANDLER-NEXT: (local.get $0)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: (global.set $__stack_limit_3
;; HANDLER-NEXT: (local.get $1)
;; HANDLER-NEXT: )
;; HANDLER-NEXT: )
Loading