Skip to content

Commit

Permalink
Fix error in type of memory.init introduced in #56 (#57)
Browse files Browse the repository at this point in the history 
Sorry for the churn.  This time I'll double check the test in wabt
before updating the testsuite repo.
  • Loading branch information
@sbc100
sbc100 authored May 3, 2024
1 parent 394c31b commit 04620c2
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion interpreter/valid/valid.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ let rec check_instr (c : context) (e : instr) (s : infer_result_type) : op_type
| MemoryInit x ->
let MemoryType (_, it) = memory c (0l @@ e.at) in
ignore (data c x);
[value_type_of_index_type it; value_type_of_index_type it; value_type_of_index_type it] --> []
[value_type_of_index_type it; NumType I32Type; NumType I32Type] --> []

| DataDrop x ->
ignore (data c x);
Expand Down
92 changes: 46 additions & 46 deletions test/core/memory_init.wast
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@
(data (i64.const 12) "\07\05\02\03\06")
(data "\05\09\02\07\06")
(func (export "test")
(memory.init 1 (i64.const 7) (i64.const 0) (i64.const 4)))
(memory.init 1 (i64.const 7) (i32.const 0) (i32.const 4)))
(func (export "load8_u") (param i64) (result i32)
(i32.load8_u (local.get 0))))

Expand Down Expand Up @@ -1061,7 +1061,7 @@
(data (i64.const 12) "\07\05\02\03\06")
(data "\05\09\02\07\06")
(func (export "test")
(memory.init 3 (i64.const 15) (i64.const 1) (i64.const 3)))
(memory.init 3 (i64.const 15) (i32.const 1) (i32.const 3)))
(func (export "load8_u") (param i64) (result i32)
(i32.load8_u (local.get 0))))

Expand Down Expand Up @@ -1105,9 +1105,9 @@
(data (i64.const 12) "\07\05\02\03\06")
(data "\05\09\02\07\06")
(func (export "test")
(memory.init 1 (i64.const 7) (i64.const 0) (i64.const 4))
(memory.init 1 (i64.const 7) (i32.const 0) (i32.const 4))
(data.drop 1)
(memory.init 3 (i64.const 15) (i64.const 1) (i64.const 3))
(memory.init 3 (i64.const 15) (i32.const 1) (i32.const 3))
(data.drop 3)
(memory.copy (i64.const 20) (i64.const 15) (i64.const 5))
(memory.copy (i64.const 21) (i64.const 29) (i64.const 1))
Expand Down Expand Up @@ -1176,99 +1176,99 @@
(data "\37")
(func (export "test")
(data.drop 0)
(memory.init 0 (i64.const 1234) (i64.const 1) (i64.const 1))))
(memory.init 0 (i64.const 1234) (i32.const 1) (i32.const 1))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data (i64.const 0) "\37")
(func (export "test")
(memory.init 0 (i64.const 1234) (i64.const 1) (i64.const 1))))
(memory.init 0 (i64.const 1234) (i32.const 1) (i32.const 1))))
(assert_trap (invoke "test") "out of bounds memory access")

(assert_invalid
(module
(func (export "test")
(memory.init 1 (i64.const 1234) (i64.const 1) (i64.const 1))))
(memory.init 1 (i64.const 1234) (i32.const 1) (i32.const 1))))
"unknown memory 0")

(assert_invalid
(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 1 (i64.const 1234) (i64.const 1) (i64.const 1))))
(memory.init 1 (i64.const 1234) (i32.const 1) (i32.const 1))))
"unknown data segment 1")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1) (i64.const 0) (i64.const 1))
(memory.init 0 (i64.const 1) (i64.const 0) (i64.const 1))))
(memory.init 0 (i64.const 1) (i32.const 0) (i32.const 1))
(memory.init 0 (i64.const 1) (i32.const 0) (i32.const 1))))
(invoke "test")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1234) (i64.const 0) (i64.const 5))))
(memory.init 0 (i64.const 1234) (i32.const 0) (i32.const 5))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1234) (i64.const 2) (i64.const 3))))
(memory.init 0 (i64.const 1234) (i32.const 2) (i32.const 3))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 0xFFFE) (i64.const 1) (i64.const 3))))
(memory.init 0 (i64.const 0xFFFE) (i32.const 1) (i32.const 3))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1234) (i64.const 4) (i64.const 0))))
(memory.init 0 (i64.const 1234) (i32.const 4) (i32.const 0))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1234) (i64.const 1) (i64.const 0))))
(memory.init 0 (i64.const 1234) (i32.const 1) (i32.const 0))))
(invoke "test")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 0x10001) (i64.const 0) (i64.const 0))))
(memory.init 0 (i64.const 0x10001) (i32.const 0) (i32.const 0))))
(assert_trap (invoke "test") "out of bounds memory access")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 0x10000) (i64.const 0) (i64.const 0))))
(memory.init 0 (i64.const 0x10000) (i32.const 0) (i32.const 0))))
(invoke "test")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 0x10000) (i64.const 1) (i64.const 0))))
(memory.init 0 (i64.const 0x10000) (i32.const 1) (i32.const 0))))
(invoke "test")

(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 0x10001) (i64.const 4) (i64.const 0))))
(memory.init 0 (i64.const 0x10001) (i32.const 4) (i32.const 0))))
(assert_trap (invoke "test") "out of bounds memory access")

(assert_invalid
Expand Down Expand Up @@ -1527,14 +1527,6 @@
(memory.init 0 (f32.const 1) (f64.const 1) (f64.const 1))))
"type mismatch")

(assert_invalid
(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1) (i32.const 1) (i32.const 1))))
"type mismatch")

(assert_invalid
(module
(memory i64 1)
Expand Down Expand Up @@ -1607,6 +1599,14 @@
(memory.init 0 (i64.const 1) (i64.const 1) (f32.const 1))))
"type mismatch")

(assert_invalid
(module
(memory i64 1)
(data "\37")
(func (export "test")
(memory.init 0 (i64.const 1) (i64.const 1) (i64.const 1))))
"type mismatch")

(assert_invalid
(module
(memory i64 1)
Expand Down Expand Up @@ -1790,10 +1790,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 65528) (i64.const 16))
(assert_trap (invoke "run" (i64.const 65528) (i32.const 16))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1813,10 +1813,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 65527) (i64.const 16))
(assert_trap (invoke "run" (i64.const 65527) (i32.const 16))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1836,10 +1836,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 65472) (i64.const 30))
(assert_trap (invoke "run" (i64.const 65472) (i32.const 30))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1859,10 +1859,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 65473) (i64.const 31))
(assert_trap (invoke "run" (i64.const 65473) (i32.const 31))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1882,10 +1882,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 65528) (i64.const 4294967040))
(assert_trap (invoke "run" (i64.const 65528) (i32.const 4294967040))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1905,10 +1905,10 @@
(br $cont))))
(return (local.get $from)))

(func (export "run") (param $offs i64) (param $len i64)
(memory.init 0 (local.get $offs) (i64.const 0) (local.get $len))))
(func (export "run") (param $offs i64) (param $len i32)
(memory.init 0 (local.get $offs) (i32.const 0) (local.get $len))))

(assert_trap (invoke "run" (i64.const 0) (i64.const 4294967292))
(assert_trap (invoke "run" (i64.const 0) (i32.const 4294967292))
"out of bounds memory access")

(assert_return (invoke "checkRange" (i64.const 0) (i64.const 1) (i32.const 0))
Expand All @@ -1927,4 +1927,4 @@
(data "") (data "") (data "") (data "") (data "") (data "") (data "") (data "")
(data "") (data "") (data "") (data "") (data "") (data "") (data "") (data "")
(data "")
(func (memory.init 64 (i64.const 0) (i64.const 0) (i64.const 0))))
(func (memory.init 64 (i64.const 0) (i32.const 0) (i32.const 0))))
Loading

0 comments on commit 04620c2

Please sign in to comment.