Skip to content

[spec] Compact subtyping check in branch rules (WIP) #2174

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

Closed
rossberg wants to merge 1 commit into from
Closed

[spec] Compact subtyping check in branch rules (WIP) #2174

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
16 changes: 4 additions & 12 deletions specification/wasm-3.0/4.3-execution.instructions.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ rule Step_pure/br_on_non_null-addr:

rule Step_read/br_on_cast-succeed:
s; f; ref (BR_ON_CAST l rt_1 rt_2) ~> ref (BR l)
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : rt
-- Reftype_sub: {} |- rt <: $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)

rule Step_read/br_on_cast-fail:
s; f; ref (BR_ON_CAST l rt_1 rt_2) ~> ref
Expand All @@ -159,9 +157,7 @@ rule Step_read/br_on_cast-fail:

rule Step_read/br_on_cast_fail-succeed:
s; f; ref (BR_ON_CAST_FAIL l rt_1 rt_2) ~> ref
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : rt
-- Reftype_sub: {} |- rt <: $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)

rule Step_read/br_on_cast_fail-fail:
s; f; ref (BR_ON_CAST_FAIL l rt_1 rt_2) ~> ref (BR l)
Expand Down Expand Up @@ -666,9 +662,7 @@ rule Step_pure/ref.eq-false:

rule Step_read/ref.test-true:
s; f; ref (REF.TEST rt) ~> (CONST I32 1)
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : rt'
-- Reftype_sub: {} |- rt' <: $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)

rule Step_read/ref.test-false:
s; f; ref (REF.TEST rt) ~> (CONST I32 0)
Expand All @@ -677,9 +671,7 @@ rule Step_read/ref.test-false:

rule Step_read/ref.cast-succeed:
s; f; ref (REF.CAST rt) ~> ref
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : rt'
-- Reftype_sub: {} |- rt' <: $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)

rule Step_read/ref.cast-fail:
s; f; ref (REF.CAST rt) ~> TRAP
Expand Down
18 changes: 9 additions & 9 deletions specification/wasm-latest/4.1-execution.values.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,33 @@ rule Vec_ok:


rule Ref_ok/null:
s |- REF.NULL_ADDR : (REF NULL BOT)
s |- REF.NULL_ADDR : REF NULL BOT

rule Ref_ok/i31:
s |- REF.I31_NUM i : (REF I31)
s |- REF.I31_NUM i : REF I31

rule Ref_ok/struct:
s |- REF.STRUCT_ADDR a : (REF dt)
s |- REF.STRUCT_ADDR a : REF dt
-- if s.STRUCTS[a].TYPE = dt

rule Ref_ok/array:
s |- REF.ARRAY_ADDR a : (REF dt)
s |- REF.ARRAY_ADDR a : REF dt
-- if s.ARRAYS[a].TYPE = dt

rule Ref_ok/func:
s |- REF.FUNC_ADDR a : (REF dt)
s |- REF.FUNC_ADDR a : REF dt
-- if s.FUNCS[a].TYPE = dt

rule Ref_ok/exn:
s |- REF.EXN_ADDR a : (REF EXN)
s |- REF.EXN_ADDR a : REF EXN
-- if s.EXNS[a] = exn

rule Ref_ok/host:
s |- REF.HOST_ADDR a : (REF ANY)
s |- REF.HOST_ADDR a : REF ANY

rule Ref_ok/extern:
s |- REF.EXTERN ref : (REF EXTERN)
-- Ref_ok: s |- ref : (REF ANY)
s |- REF.EXTERN ref : REF EXTERN
-- Ref_ok: s |- ref : REF ANY
-- if ref =/= REF.NULL_ADDR

rule Ref_ok/sub:
Expand Down
16 changes: 4 additions & 12 deletions specification/wasm-latest/4.3-execution.instructions.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ rule Step_pure/br_on_non_null-addr:

rule Step_read/br_on_cast-succeed:
s; f; ref (BR_ON_CAST l rt_1 rt_2) ~> ref (BR l)
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : rt
-- Reftype_sub: {} |- rt <: $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)

rule Step_read/br_on_cast-fail:
s; f; ref (BR_ON_CAST l rt_1 rt_2) ~> ref
Expand All @@ -159,9 +157,7 @@ rule Step_read/br_on_cast-fail:

rule Step_read/br_on_cast_fail-succeed:
s; f; ref (BR_ON_CAST_FAIL l rt_1 rt_2) ~> ref
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : rt
-- Reftype_sub: {} |- rt <: $inst_reftype(f.MODULE, rt_2)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt_2)

rule Step_read/br_on_cast_fail-fail:
s; f; ref (BR_ON_CAST_FAIL l rt_1 rt_2) ~> ref (BR l)
Expand Down Expand Up @@ -666,9 +662,7 @@ rule Step_pure/ref.eq-false:

rule Step_read/ref.test-true:
s; f; ref (REF.TEST rt) ~> (CONST I32 1)
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : rt'
-- Reftype_sub: {} |- rt' <: $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)

rule Step_read/ref.test-false:
s; f; ref (REF.TEST rt) ~> (CONST I32 0)
Expand All @@ -677,9 +671,7 @@ rule Step_read/ref.test-false:

rule Step_read/ref.cast-succeed:
s; f; ref (REF.CAST rt) ~> ref
;; TODO(3, rossberg): -- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : rt'
-- Reftype_sub: {} |- rt' <: $inst_reftype(f.MODULE, rt)
-- Ref_ok: s |- ref : $inst_reftype(f.MODULE, rt)

rule Step_read/ref.cast-fail:
s; f; ref (REF.CAST rt) ~> TRAP
Expand Down
Loading