Skip to content

Make allocation instructions exact #103

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

Open
tlively wants to merge 2 commits into
base: exact-extern-functype
Choose a base branch
from
Open

Make allocation instructions exact #103

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
edfe5a2
Make allocation instructions exact
tlively Jul 9, 2026
153b685
update tests
tlively Jul 14, 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
14 changes: 7 additions & 7 deletions specification/wasm-latest/2.3-validation.instructions.spectec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,11 @@ rule Instr_ok/i31.get:
;; Structure instructions

rule Instr_ok/struct.new:
C |- STRUCT.NEW x : $unpack(zt)* -> (REF (_HT _IDX x))
C |- STRUCT.NEW x : $unpack(zt)* -> (REF (_HT EXACT _IDX x))
-- ExpandDesc: C.TYPES[x] ~~ describestype? eps STRUCT (mut? zt)*

rule Instr_ok/struct.new_default:
C |- STRUCT.NEW_DEFAULT x : eps -> (REF (_HT _IDX x))
C |- STRUCT.NEW_DEFAULT x : eps -> (REF (_HT EXACT _IDX x))
-- ExpandDesc: C.TYPES[x] ~~ describestype? eps STRUCT (mut? zt)*
-- (Defaultable: |- $unpack(zt) DEFAULTABLE)*

Expand Down Expand Up @@ -287,25 +287,25 @@ rule Instr_ok/struct.set:
;; Array instructions

rule Instr_ok/array.new:
C |- ARRAY.NEW x : $unpack(zt) I32 -> (REF (_HT _IDX x))
C |- ARRAY.NEW x : $unpack(zt) I32 -> (REF (_HT EXACT _IDX x))
-- Expand: C.TYPES[x] ~~ ARRAY (mut? zt)

rule Instr_ok/array.new_default:
C |- ARRAY.NEW_DEFAULT x : I32 -> (REF (_HT _IDX x))
C |- ARRAY.NEW_DEFAULT x : I32 -> (REF (_HT EXACT _IDX x))
-- Expand: C.TYPES[x] ~~ ARRAY (mut? zt)
-- Defaultable: |- $unpack(zt) DEFAULTABLE

rule Instr_ok/array.new_fixed:
C |- ARRAY.NEW_FIXED x n : $unpack(zt)^n -> (REF (_HT _IDX x))
C |- ARRAY.NEW_FIXED x n : $unpack(zt)^n -> (REF (_HT EXACT _IDX x))
-- Expand: C.TYPES[x] ~~ ARRAY (mut? zt)

rule Instr_ok/array.new_elem:
C |- ARRAY.NEW_ELEM x y : I32 I32 -> (REF (_HT _IDX x))
C |- ARRAY.NEW_ELEM x y : I32 I32 -> (REF (_HT EXACT _IDX x))
-- Expand: C.TYPES[x] ~~ ARRAY (mut? rt)
-- Reftype_sub: C |- C.ELEMS[y] <: rt

rule Instr_ok/array.new_data:
C |- ARRAY.NEW_DATA x y : I32 I32 -> (REF (_HT _IDX x))
C |- ARRAY.NEW_DATA x y : I32 I32 -> (REF (_HT EXACT _IDX x))
-- Expand: C.TYPES[x] ~~ ARRAY (mut? zt)
-- if $unpack(zt) = numtype \/ $unpack(zt) = vectype
-- if C.DATAS[y] = OK
Expand Down
14 changes: 7 additions & 7 deletions spectec/test-frontend/TEST.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3643,12 +3643,12 @@ relation Instr_ok: `%|-%:%`(context, instr, instrtype)

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:254.1-256.68
rule struct.new{C : context, x : idx, `zt*` : storagetype*, `describestype?` : describestype?, `mut?*` : mut?*}:
`%|-%:%`(C, STRUCT.NEW_instr(x), `%->_%%`_instrtype(`%`_resulttype($unpack(zt)*{zt <- `zt*`}), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, STRUCT.NEW_instr(x), `%->_%%`_instrtype(`%`_resulttype($unpack(zt)*{zt <- `zt*`}), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- ExpandDesc: `%~~%`(C.TYPES_context[x!`%`_idx.0], `%%%`_desctype(describestype?{describestype <- `describestype?`}, ?(), STRUCT_comptype(`%`_list(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)*{`mut?` <- `mut?*`, zt <- `zt*`}))))

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:258.1-261.48
rule struct.new_default{C : context, x : idx, `describestype?` : describestype?, `mut?*` : mut?*, `zt*` : storagetype*}:
`%|-%:%`(C, STRUCT.NEW_DEFAULT_instr(x), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, STRUCT.NEW_DEFAULT_instr(x), `%->_%%`_instrtype(`%`_resulttype([]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- ExpandDesc: `%~~%`(C.TYPES_context[x!`%`_idx.0], `%%%`_desctype(describestype?{describestype <- `describestype?`}, ?(), STRUCT_comptype(`%`_list(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)*{`mut?` <- `mut?*`, zt <- `zt*`}))))
-- (Defaultable: `|-%DEFAULTABLE`($unpack(zt)))*{zt <- `zt*`}

Expand Down Expand Up @@ -3678,29 +3678,29 @@ relation Instr_ok: `%|-%:%`(context, instr, instrtype)

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:289.1-291.43
rule array.new{C : context, x : idx, zt : storagetype, `mut?` : mut?}:
`%|-%:%`(C, ARRAY.NEW_instr(x), `%->_%%`_instrtype(`%`_resulttype([$unpack(zt) I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, ARRAY.NEW_instr(x), `%->_%%`_instrtype(`%`_resulttype([$unpack(zt) I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- Expand: `%~~%`(C.TYPES_context[x!`%`_idx.0], ARRAY_comptype(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)))

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:293.1-296.45
rule array.new_default{C : context, x : idx, `mut?` : mut?, zt : storagetype}:
`%|-%:%`(C, ARRAY.NEW_DEFAULT_instr(x), `%->_%%`_instrtype(`%`_resulttype([I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, ARRAY.NEW_DEFAULT_instr(x), `%->_%%`_instrtype(`%`_resulttype([I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- Expand: `%~~%`(C.TYPES_context[x!`%`_idx.0], ARRAY_comptype(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)))
-- Defaultable: `|-%DEFAULTABLE`($unpack(zt))

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:298.1-300.43
rule array.new_fixed{C : context, x : idx, n : n, zt : storagetype, `mut?` : mut?}:
`%|-%:%`(C, ARRAY.NEW_FIXED_instr(x, `%`_u32(n)), `%->_%%`_instrtype(`%`_resulttype($unpack(zt)^n{}), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, ARRAY.NEW_FIXED_instr(x, `%`_u32(n)), `%->_%%`_instrtype(`%`_resulttype($unpack(zt)^n{}), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- Expand: `%~~%`(C.TYPES_context[x!`%`_idx.0], ARRAY_comptype(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)))

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:302.1-305.40
rule array.new_elem{C : context, x : idx, y : idx, `mut?` : mut?, rt : reftype}:
`%|-%:%`(C, ARRAY.NEW_ELEM_instr(x, y), `%->_%%`_instrtype(`%`_resulttype([I32_valtype I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, ARRAY.NEW_ELEM_instr(x, y), `%->_%%`_instrtype(`%`_resulttype([I32_valtype I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- Expand: `%~~%`(C.TYPES_context[x!`%`_idx.0], ARRAY_comptype(`%%`_fieldtype(mut?{mut <- `mut?`}, (rt : reftype <: storagetype))))
-- Reftype_sub: `%|-%<:%`(C, C.ELEMS_context[y!`%`_idx.0], rt)

;; ../../../../specification/wasm-latest/2.3-validation.instructions.spectec:307.1-311.24
rule array.new_data{C : context, x : idx, y : idx, `mut?` : mut?, zt : storagetype, numtype : numtype, vectype : vectype}:
`%|-%:%`(C, ARRAY.NEW_DATA_instr(x, y), `%->_%%`_instrtype(`%`_resulttype([I32_valtype I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(), _IDX_typeuse(x)))])))
`%|-%:%`(C, ARRAY.NEW_DATA_instr(x, y), `%->_%%`_instrtype(`%`_resulttype([I32_valtype I32_valtype]), [], `%`_resulttype([REF_valtype(?(), _HT_heaptype(?(EXACT_exact), _IDX_typeuse(x)))])))
-- Expand: `%~~%`(C.TYPES_context[x!`%`_idx.0], ARRAY_comptype(`%%`_fieldtype(mut?{mut <- `mut?`}, zt)))
-- if (($unpack(zt) = (numtype : numtype <: valtype)) \/ ($unpack(zt) = (vectype : vectype <: valtype)))
-- if (C.DATAS_context[y!`%`_idx.0] = OK_datatype)
Expand Down
Loading