Skip to content

[spec] Typing rule fix for handler #2180

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
rossberg merged 2 commits into from
Jun 4, 2026
Merged

[spec] Typing rule fix for handler #2180

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
d94884f
tightened handler typing rule
raoxiaojia Jun 4, 2026
4313a3d
update test expects
raoxiaojia Jun 4, 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
4 changes: 2 additions & 2 deletions specification/wasm-3.0/7.1-soundness.configurations.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ rule Instr_ok2/frame:
-- Expr_ok2: s; C' |- instr* : t^n

rule Instr_ok2/handler:
s; C |- HANDLER_ n `{catch*} instr* : t_1* -> t_2*
s; C |- HANDLER_ n `{catch*} instr* : eps -> t*
-- (Catch_ok: C |- catch : OK)*
-- Instrs_ok2: s; C |- instr* : t_1* ->_(x*) t_2*
-- Instrs_ok2: s; C |- instr* : eps ->_(x*) t*

rule Instr_ok2/trap:
s; C |- TRAP : t_1* -> t_2*
Expand Down
4 changes: 2 additions & 2 deletions specification/wasm-latest/7.1-soundness.configurations.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ rule Instr_ok2/frame:
-- Expr_ok2: s; C' |- instr* : t^n

rule Instr_ok2/handler:
s; C |- HANDLER_ n `{catch*} instr* : t_1* -> t_2*
s; C |- HANDLER_ n `{catch*} instr* : eps -> t*
-- (Catch_ok: C |- catch : OK)*
-- Instrs_ok2: s; C |- instr* : t_1* ->_(x*) t_2*
-- Instrs_ok2: s; C |- instr* : eps ->_(x*) t*

rule Instr_ok2/trap:
s; C |- TRAP : t_1* -> t_2*
Expand Down
8 changes: 4 additions & 4 deletions spectec/test-frontend/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8235,11 +8235,11 @@ relation Instr_ok2: `%;%|-%:%`(store, context, instr, instrtype)
-- Frame_ok: `%|-%:%`(s, f, C')
-- Expr_ok2: `%;%|-%:%`(s, C', instr*{instr <- `instr*`}, `%`_resulttype(t^n{t <- `t*`}))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.52
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t_1*` : valtype*, `t_2*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), [], `%`_resulttype(t_2*{t_2 <- `t_2*`})))
;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.49
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype(t*{t <- `t*`})))
-- (Catch_ok: `%|-%:OK`(C, catch))*{catch <- `catch*`}
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), x*{x <- `x*`}, `%`_resulttype(t_2*{t_2 <- `t_2*`})))
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype([]), x*{x <- `x*`}, `%`_resulttype(t*{t <- `t*`})))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:33.1-35.42
rule trap{s : store, C : context, `t_1*` : valtype*, `t_2*` : valtype*}:
Expand Down
4 changes: 2 additions & 2 deletions spectec/test-latex/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14165,9 +14165,9 @@ $$
\frac{
(C \vdash {\mathit{catch}} : \mathsf{ok})^\ast
\qquad
s ; C \vdash {{\mathit{instr}}^\ast} : {t_1^\ast} \rightarrow_{{x^\ast}} {t_2^\ast}
s ; C \vdash {{\mathit{instr}}^\ast} : \epsilon \rightarrow_{{x^\ast}} {t^\ast}
}{
s ; C \vdash {{\mathsf{handler}}_{n}}{\{ {{\mathit{catch}}^\ast} \}}~{{\mathit{instr}}^\ast} : {t_1^\ast} \rightarrow {t_2^\ast}
s ; C \vdash {{\mathsf{handler}}_{n}}{\{ {{\mathit{catch}}^\ast} \}}~{{\mathit{instr}}^\ast} : \epsilon \rightarrow {t^\ast}
} \, {[\textsc{\scriptsize Instr\_ok2{-}handler}]}
\qquad
\end{array}
Expand Down
24 changes: 12 additions & 12 deletions spectec/test-middlend/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7758,11 +7758,11 @@ relation Instr_ok2: `%;%|-%:%`(store, context, instr, instrtype)
-- Frame_ok: `%|-%:%`(s, f, C')
-- Expr_ok2: `%;%|-%:%`(s, C', instr*{instr <- `instr*`}, `%`_resulttype(t^n{t <- `t*`}))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.52
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t_1*` : valtype*, `t_2*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), [], `%`_resulttype(t_2*{t_2 <- `t_2*`})))
;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.49
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype(t*{t <- `t*`})))
-- (Catch_ok: `%|-%:OK`(C, catch))*{catch <- `catch*`}
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), x*{x <- `x*`}, `%`_resulttype(t_2*{t_2 <- `t_2*`})))
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype([]), x*{x <- `x*`}, `%`_resulttype(t*{t <- `t*`})))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:33.1-35.42
rule trap{s : store, C : context, `t_1*` : valtype*, `t_2*` : valtype*}:
Expand Down Expand Up @@ -19610,11 +19610,11 @@ relation Instr_ok2: `%;%|-%:%`(store, context, instr, instrtype)
-- Frame_ok: `%|-%:%`(s, f, C')
-- Expr_ok2: `%;%|-%:%`(s, C', instr*{instr <- `instr*`}, `%`_resulttype(t^n{t <- `t*`}))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.52
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t_1*` : valtype*, `t_2*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), [], `%`_resulttype(t_2*{t_2 <- `t_2*`})))
;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.49
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype(t*{t <- `t*`})))
-- (Catch_ok: `%|-%:OK`(C, catch))*{catch <- `catch*`}
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), x*{x <- `x*`}, `%`_resulttype(t_2*{t_2 <- `t_2*`})))
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype([]), x*{x <- `x*`}, `%`_resulttype(t*{t <- `t*`})))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:33.1-35.42
rule trap{s : store, C : context, `t_1*` : valtype*, `t_2*` : valtype*}:
Expand Down Expand Up @@ -31657,11 +31657,11 @@ relation Instr_ok2: `%;%|-%:%`(store, context, instr, instrtype)
-- Frame_ok: `%|-%:%`(s, f, C')
-- Expr_ok2: `%;%|-%:%`(s, C', instr*{instr <- `instr*`}, `%`_resulttype(t^n{t <- `t*`}))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.52
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t_1*` : valtype*, `t_2*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), [], `%`_resulttype(t_2*{t_2 <- `t_2*`})))
;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:28.1-31.49
rule handler{s : store, C : context, n : n, `catch*` : catch*, `instr*` : instr*, `t*` : valtype*, `x*` : idx*}:
`%;%|-%:%`(s, C, `HANDLER_%{%}%`_instr(n, catch*{catch <- `catch*`}, instr*{instr <- `instr*`}), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype(t*{t <- `t*`})))
-- (Catch_ok: `%|-%:OK`(C, catch))*{catch <- `catch*`}
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype(t_1*{t_1 <- `t_1*`}), x*{x <- `x*`}, `%`_resulttype(t_2*{t_2 <- `t_2*`})))
-- Instrs_ok2: `%;%|-%:%`(s, C, instr*{instr <- `instr*`}, `%->_%%`_instrtype(`%`_resulttype([]), x*{x <- `x*`}, `%`_resulttype(t*{t <- `t*`})))

;; ../../../../specification/wasm-latest/7.1-soundness.configurations.spectec:33.1-35.42
rule trap{s : store, C : context, `t_1*` : valtype*, `t_2*` : valtype*}:
Expand Down
15 changes: 9 additions & 6 deletions spectec/test-prose/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17987,13 +17987,15 @@ The frame :math:`\{ \mathsf{locals}~{({{\mathit{val}}^?})^\ast},\;\allowbreak \m

* The instruction :math:`{\mathit{instr}}` is of the form :math:`({{\mathsf{handler}}_{n}}{\{}~{{\mathit{catch}}^\ast}~\}~{{\mathit{instr}''}^\ast})`.

* The value type sequence :math:`{{\mathit{valtype}}^\ast}` is empty.

* The local index sequence :math:`{{\mathit{localidx}}^\ast}` is empty.

* For all :math:`{\mathit{catch}}` in :math:`{{\mathit{catch}}^\ast}`:

* The catch clause :math:`{\mathit{catch}}` is :ref:`valid <valid-val>`.

* :math:`{{\mathit{instr}''}^\ast}` is valid with :math:`{{\mathit{valtype}}^\ast}~{\rightarrow}_{{x^\ast}}\,{{\mathit{valtype}'}^\ast}`.
* :math:`{{\mathit{instr}''}^\ast}` is valid with :math:`\epsilon~{\rightarrow}_{{x^\ast}}\,{{\mathit{valtype}'}^\ast}`.
* Or:

* The instruction :math:`{\mathit{instr}}` is of the form :math:`\mathsf{trap}`.
Expand Down Expand Up @@ -18041,14 +18043,14 @@ The frame :math:`\{ \mathsf{locals}~{({{\mathit{val}}^?})^\ast},\;\allowbreak \m



:math:`({{\mathsf{handler}}_{n}}{\{}~{{\mathit{catch}}^\ast}~\}~{{\mathit{instr}}^\ast})` is valid with :math:`{t_1^\ast}~\rightarrow~{t_2^\ast}` if:
:math:`({{\mathsf{handler}}_{n}}{\{}~{{\mathit{catch}}^\ast}~\}~{{\mathit{instr}}^\ast})` is valid with :math:`\epsilon~\rightarrow~{t^\ast}` if:


* For all :math:`{\mathit{catch}}` in :math:`{{\mathit{catch}}^\ast}`:

* The catch clause :math:`{\mathit{catch}}` is :ref:`valid <valid-val>`.

* :math:`{{\mathit{instr}}^\ast}` is valid with :math:`{t_1^\ast}~{\rightarrow}_{{x^\ast}}\,{t_2^\ast}`.
* :math:`{{\mathit{instr}}^\ast}` is valid with :math:`\epsilon~{\rightarrow}_{{x^\ast}}\,{t^\ast}`.



Expand Down Expand Up @@ -29764,10 +29766,11 @@ Instr_ok2
- instr''* is valid with valtype'^n.
- Or:
- instr is (HANDLER_ n { catch* } instr''*).
- valtype* is [].
- localidx* is [].
- For all catch in catch*:
- the catch clause catch is valid.
- instr''* is valid with valtype* ->_ x* valtype'*.
- instr''* is valid with [] ->_ x* valtype'*.
- Or:
- instr is TRAP.
- localidx* is [].
Expand All @@ -29792,10 +29795,10 @@ Instr_ok2/frame
- instr* is valid with t^n.

Instr_ok2/handler
- (HANDLER_ n { catch* } instr*) is valid with t_1* -> t_2* if:
- (HANDLER_ n { catch* } instr*) is valid with [] -> t* if:
- For all catch in catch*:
- the catch clause catch is valid.
- instr* is valid with t_1* ->_ x* t_2*.
- instr* is valid with [] ->_ x* t*.

Instr_ok2/trap
- TRAP is valid with t_1* -> t_2* if:
Expand Down
Loading