diff options
Diffstat (limited to 'test')
86 files changed, 421 insertions, 390 deletions
diff --git a/test/desugar/basic.txt b/test/desugar/basic.txt index 0fe702eb..7bd7488b 100644 --- a/test/desugar/basic.txt +++ b/test/desugar/basic.txt @@ -12,8 +12,8 @@ (i32.add (call 0) (i32.load8_s (i32.const 1))))) (;; STDOUT ;;; (module - (import "foo" "bar" (func (;0;) (result i32))) (type (;0;) (func (result i32))) + (import "foo" "bar" (func (;0;) (result i32))) (global (;0;) i32 (i32.const 1)) (table (;0;) 1 1 anyfunc) (elem (i32.const 0) 0) diff --git a/test/dump/block.txt b/test/dump/block.txt index 3ef2a46f..9f928b33 100644 --- a/test/dump/block.txt +++ b/test/dump/block.txt @@ -9,7 +9,7 @@ end) (func (result i32) - block i32 + block (result i32) i32.const 1 end)) (;; STDOUT ;;; diff --git a/test/dump/br-loop-inner-expr.txt b/test/dump/br-loop-inner-expr.txt index a59a5c71..e5265b4c 100644 --- a/test/dump/br-loop-inner-expr.txt +++ b/test/dump/br-loop-inner-expr.txt @@ -2,8 +2,8 @@ ;;; FLAGS: -v (module (func (result i32) - block $exit i32 - loop $cont i32 + block $exit (result i32) + loop $cont (result i32) i32.const 1 if br $cont diff --git a/test/dump/const.txt b/test/dump/const.txt index 55fc55fa..df372c19 100644 --- a/test/dump/const.txt +++ b/test/dump/const.txt @@ -8,7 +8,7 @@ drop i32.const 4294967295 drop - i32.const -0x80000000 + i32.const -0x80000000 drop i32.const 0xffffffff drop @@ -40,15 +40,15 @@ drop f32.const +nan:0xabc drop - f32.const infinity + f32.const inf drop - f32.const -infinity + f32.const -inf drop - f32.const +infinity + f32.const +inf drop f32.const -0x1p-1 drop - f32.const 0x1.921fb6p+2 + f32.const 0x1.921fb6p+2 drop f64.const 0.0 drop @@ -68,11 +68,11 @@ drop f64.const +nan:0xabc drop - f64.const infinity + f64.const inf drop - f64.const -infinity + f64.const -inf drop - f64.const +infinity + f64.const +inf drop f64.const -0x1p-1 drop @@ -266,11 +266,11 @@ Code Disassembly: 000080: 1a | drop 000081: 43 bc 0a 80 7f | f32.const nan:0xabc 000086: 1a | drop - 000087: 43 00 00 80 7f | f32.const infinity + 000087: 43 00 00 80 7f | f32.const inf 00008c: 1a | drop - 00008d: 43 00 00 80 ff | f32.const -infinity + 00008d: 43 00 00 80 ff | f32.const -inf 000092: 1a | drop - 000093: 43 00 00 80 7f | f32.const infinity + 000093: 43 00 00 80 7f | f32.const inf 000098: 1a | drop 000099: 43 00 00 00 bf | f32.const -0x1p-1 00009e: 1a | drop @@ -294,11 +294,11 @@ Code Disassembly: 0000f4: 1a | drop 0000f5: 44 bc 0a 00 00 00 00 f0 7f | f64.const nan:0xabc 0000fe: 1a | drop - 0000ff: 44 00 00 00 00 00 00 f0 7f | f64.const infinity + 0000ff: 44 00 00 00 00 00 00 f0 7f | f64.const inf 000108: 1a | drop - 000109: 44 00 00 00 00 00 00 f0 ff | f64.const -infinity + 000109: 44 00 00 00 00 00 00 f0 ff | f64.const -inf 000112: 1a | drop - 000113: 44 00 00 00 00 00 00 f0 7f | f64.const infinity + 000113: 44 00 00 00 00 00 00 f0 7f | f64.const inf 00011c: 1a | drop 00011d: 44 00 00 00 00 00 00 e0 bf | f64.const -0x1p-1 000126: 1a | drop diff --git a/test/dump/expr-br.txt b/test/dump/expr-br.txt index 004e4c42..e450350c 100644 --- a/test/dump/expr-br.txt +++ b/test/dump/expr-br.txt @@ -2,7 +2,7 @@ ;;; FLAGS: -v (module (func (result i32) - block i32 + block (result i32) i32.const 1 br 0 end)) diff --git a/test/dump/expr-brif.txt b/test/dump/expr-brif.txt index 3aa821b6..5828f0a5 100644 --- a/test/dump/expr-brif.txt +++ b/test/dump/expr-brif.txt @@ -2,7 +2,7 @@ ;;; FLAGS: -v (module (func (result i32) - block $exit i32 + block $exit (result i32) i32.const 42 i32.const 0 br_if $exit diff --git a/test/dump/hexfloat_f32.txt b/test/dump/hexfloat_f32.txt index 0c9593b9..2be9bab8 100644 --- a/test/dump/hexfloat_f32.txt +++ b/test/dump/hexfloat_f32.txt @@ -139,7 +139,7 @@ Code Disassembly: 000040: 1a | drop 000041: 43 fe ff 7f 7e | f32.const 0x1.fffffcp+125 000046: 1a | drop - 000047: 43 00 00 80 7f | f32.const infinity + 000047: 43 00 00 80 7f | f32.const inf 00004c: 1a | drop 00004d: 43 c4 ff 7f 7f | f32.const 0x1.ffff88p+127 000052: 1a | drop diff --git a/test/dump/hexfloat_f64.txt b/test/dump/hexfloat_f64.txt index beb5b80b..7f78e752 100644 --- a/test/dump/hexfloat_f64.txt +++ b/test/dump/hexfloat_f64.txt @@ -141,7 +141,7 @@ Code Disassembly: 00005e: 1a | drop 00005f: 44 c0 ff ff ff ff ff cf 7f | f64.const 0x1.fffffffffffcp+1021 000068: 1a | drop - 000069: 44 00 00 00 00 00 00 f0 7f | f64.const infinity + 000069: 44 00 00 00 00 00 00 f0 7f | f64.const inf 000072: 1a | drop 000073: 44 fc ff ff ff ff ff ef 7f | f64.const 0x1.ffffffffffffcp+1023 00007c: 1a | drop diff --git a/test/dump/if.txt b/test/dump/if.txt index 5f22d008..2bb9ab70 100644 --- a/test/dump/if.txt +++ b/test/dump/if.txt @@ -7,7 +7,7 @@ nop end i32.const 0 - if f32 + if (result f32) f32.const 1.0 else f32.const 2.0 diff --git a/test/interp/basic-tracing.txt b/test/interp/basic-tracing.txt index ec6a7a39..4c24011c 100644 --- a/test/interp/basic-tracing.txt +++ b/test/interp/basic-tracing.txt @@ -5,7 +5,7 @@ get_local $n i32.const 1 i32.le_s - if i32 + if (result i32) i32.const 1 else get_local $n diff --git a/test/interp/call.txt b/test/interp/call.txt index 022f56ed..7c0df054 100644 --- a/test/interp/call.txt +++ b/test/interp/call.txt @@ -29,7 +29,7 @@ get_local 0 i32.const 0 i32.gt_s - if i32 + if (result i32) get_local 0 get_local 0 i32.const 1 diff --git a/test/interp/expr-block.txt b/test/interp/expr-block.txt index 3dc33d83..b72b6ae3 100644 --- a/test/interp/expr-block.txt +++ b/test/interp/expr-block.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-interp (module (func (export "test") (result i32) - block i32 + block (result i32) i32.const 10 drop i32.const 1 diff --git a/test/interp/expr-br.txt b/test/interp/expr-br.txt index b02b17fb..f5d2d4bc 100644 --- a/test/interp/expr-br.txt +++ b/test/interp/expr-br.txt @@ -1,11 +1,11 @@ ;;; TOOL: run-interp (module (func $f (param i32) (result i32) - block i32 + block (result i32) get_local 0 i32.const 0 - i32.eq - if + i32.eq + if i32.const 1 br 1 end diff --git a/test/interp/expr-brif.txt b/test/interp/expr-brif.txt index f2d108e9..219d9a87 100644 --- a/test/interp/expr-brif.txt +++ b/test/interp/expr-brif.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-interp (module (func (param i32) (result i32) - (block $exit i32 + (block $exit (result i32) (i32.sub (br_if $exit (i32.const 42) (get_local 0)) (i32.const 13)))) diff --git a/test/interp/expr-if.txt b/test/interp/expr-if.txt index 0f08c6d0..98b0a95b 100644 --- a/test/interp/expr-if.txt +++ b/test/interp/expr-if.txt @@ -4,7 +4,7 @@ get_local 0 i32.const 0 i32.eq - if i32 + if (result i32) i32.const 1 else i32.const 2 diff --git a/test/parse/bad-string-eof.txt b/test/parse/bad-string-eof.txt index 27a6410c..1be082f0 100644 --- a/test/parse/bad-string-eof.txt +++ b/test/parse/bad-string-eof.txt @@ -4,5 +4,5 @@ out/test/parse/bad-string-eof.txt:2:25: newline in string (module (func) (export " ^ -out/test/parse/bad-string-eof.txt:3:1: syntax error, unexpected EOF, expecting TEXT +out/test/parse/bad-string-eof.txt:3:2: syntax error, unexpected EOF, expecting TEXT ;;; STDERR ;;) diff --git a/test/parse/bad-string-escape.txt b/test/parse/bad-string-escape.txt index 576fa3b5..3f8e1cfb 100644 --- a/test/parse/bad-string-escape.txt +++ b/test/parse/bad-string-escape.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 -(module (func) (export "foobar\r\n" (func 0))) +(module (func) (export "foobar\x\n" (func 0))) (;; STDERR ;;; -out/test/parse/bad-string-escape.txt:2:31: bad escape "\r" -(module (func) (export "foobar\r\n" (func 0))) +out/test/parse/bad-string-escape.txt:2:31: bad escape "\x" +(module (func) (export "foobar\x\n" (func 0))) ^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-block-sig-multi.txt b/test/parse/expr/bad-block-sig-multi.txt index cfb7ffed..294abe4e 100644 --- a/test/parse/expr/bad-block-sig-multi.txt +++ b/test/parse/expr/bad-block-sig-multi.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (func - block i32 i32 + block (result i32 i32) i32.const 1 i32.const 1 end @@ -9,6 +9,6 @@ drop)) (;; STDERR ;;; out/test/parse/expr/bad-block-sig-multi.txt:4:5: multiple block signature result types not currently supported. - block i32 i32 + block (result i32 i32) ^^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-if-sig-multi.txt b/test/parse/expr/bad-if-sig-multi.txt index 44ef8189..8268553f 100644 --- a/test/parse/expr/bad-if-sig-multi.txt +++ b/test/parse/expr/bad-if-sig-multi.txt @@ -2,7 +2,7 @@ (module (func i32.const 1 - if i32 i32 + if (result i32 i32) i32.const 1 i32.const 2 else @@ -13,6 +13,6 @@ drop)) (;; STDERR ;;; out/test/parse/expr/bad-if-sig-multi.txt:5:5: multiple if signature result types not currently supported. - if i32 i32 + if (result i32 i32) ^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-loop-sig-multi.txt b/test/parse/expr/bad-loop-sig-multi.txt index 5ea5b726..5069d191 100644 --- a/test/parse/expr/bad-loop-sig-multi.txt +++ b/test/parse/expr/bad-loop-sig-multi.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (func - loop i32 i32 + loop (result i32 i32) i32.const 1 i32.const 2 end @@ -9,6 +9,6 @@ drop)) (;; STDERR ;;; out/test/parse/expr/bad-loop-sig-multi.txt:4:5: multiple loop signature result types not currently supported. - loop i32 i32 + loop (result i32 i32) ^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-return-multi.txt b/test/parse/expr/bad-return-multi.txt index bbcafc05..4738b226 100644 --- a/test/parse/expr/bad-return-multi.txt +++ b/test/parse/expr/bad-return-multi.txt @@ -4,7 +4,7 @@ f32.const 3.14 return)) (;; STDERR ;;; -out/test/parse/expr/bad-return-multi.txt:2:9: multiple result values not currently supported. +out/test/parse/expr/bad-return-multi.txt:2:10: multiple result values not currently supported. (module (func (result f32 f32) - ^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/block-return.txt b/test/parse/expr/block-return.txt index d6c96382..6eeae185 100644 --- a/test/parse/expr/block-return.txt +++ b/test/parse/expr/block-return.txt @@ -1,6 +1,6 @@ (module (func (result i32) - block i32 + block (result i32) nop i32.const 1 return diff --git a/test/parse/expr/const.txt b/test/parse/expr/const.txt index 069339a3..1904501c 100644 --- a/test/parse/expr/const.txt +++ b/test/parse/expr/const.txt @@ -40,11 +40,11 @@ drop f32.const +nan:0xabc drop - f32.const infinity + f32.const inf drop - f32.const -infinity + f32.const -inf drop - f32.const +infinity + f32.const +inf drop f32.const -0x1p-1 drop @@ -58,25 +58,25 @@ drop f64.const 6.283185307179586 drop - f64.const nan + f64.const nan drop f64.const -nan drop f64.const +nan drop - f64.const nan:0xabc + f64.const nan:0xabc drop f64.const -nan:0xabc drop f64.const +nan:0xabc drop - f64.const infinity + f64.const inf drop - f64.const -infinity + f64.const -inf drop - f64.const +infinity + f64.const +inf drop - f64.const -0x1p-1 + f64.const -0x1p-1 drop f64.const 0x1.921fb54442d18p+2 drop)) diff --git a/test/parse/expr/expr-br.txt b/test/parse/expr/expr-br.txt index c64a9d7d..4276bab3 100644 --- a/test/parse/expr/expr-br.txt +++ b/test/parse/expr/expr-br.txt @@ -1,6 +1,6 @@ (module (func (result i32) - block $exit i32 + block $exit (result i32) i32.const 0 br 0 end)) diff --git a/test/parse/expr/expr-brif.txt b/test/parse/expr/expr-brif.txt index c9ec7311..54b9bddd 100644 --- a/test/parse/expr/expr-brif.txt +++ b/test/parse/expr/expr-brif.txt @@ -1,6 +1,6 @@ (module (func (result i32) - block $exit i32 + block $exit (result i32) i32.const 0 i32.const 0 br_if 0 diff --git a/test/parse/expr/if-return.txt b/test/parse/expr/if-return.txt index 636b98ce..4a39c5f0 100644 --- a/test/parse/expr/if-return.txt +++ b/test/parse/expr/if-return.txt @@ -1,7 +1,7 @@ (module (func (result i32) i32.const 1 - if i32 + if (result i32) i32.const 2 return else diff --git a/test/parse/expr/if-then-else-br-named.txt b/test/parse/expr/if-then-else-br-named.txt index 43c49099..6e8ef870 100644 --- a/test/parse/expr/if-then-else-br-named.txt +++ b/test/parse/expr/if-then-else-br-named.txt @@ -1,7 +1,7 @@ (module (func (result i32) i32.const 1 - if $exit i32 + if $exit (result i32) i32.const 1 br $exit else diff --git a/test/parse/expr/if-then-else-br.txt b/test/parse/expr/if-then-else-br.txt index dcacffcb..91448d3a 100644 --- a/test/parse/expr/if-then-else-br.txt +++ b/test/parse/expr/if-then-else-br.txt @@ -1,7 +1,7 @@ (module (func (result i32) i32.const 1 - if i32 + if (result i32) i32.const 1 br 0 else diff --git a/test/parse/expr/return-block.txt b/test/parse/expr/return-block.txt index 1532030f..526b488a 100644 --- a/test/parse/expr/return-block.txt +++ b/test/parse/expr/return-block.txt @@ -1,6 +1,6 @@ (module (func (result i32) - block i32 + block (result i32) nop i32.const 1 end diff --git a/test/parse/expr/return-if.txt b/test/parse/expr/return-if.txt index 640a912b..abeb3368 100644 --- a/test/parse/expr/return-if.txt +++ b/test/parse/expr/return-if.txt @@ -1,7 +1,7 @@ (module (func (result i32) i32.const 1 - if i32 + if (result i32) i32.const 2 else i32.const 3 diff --git a/test/parse/func/bad-param-redefinition.txt b/test/parse/func/bad-param-redefinition.txt index 2816a23d..5e7fb374 100644 --- a/test/parse/func/bad-param-redefinition.txt +++ b/test/parse/func/bad-param-redefinition.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (func (param $n i32) (param $n f32))) (;; STDERR ;;; -out/test/parse/func/bad-param-redefinition.txt:2:31: redefinition of parameter "$n" +out/test/parse/func/bad-param-redefinition.txt:2:37: redefinition of parameter "$n" (module (func (param $n i32) (param $n f32))) - ^^^^^ + ^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-result-multi.txt b/test/parse/func/bad-result-multi.txt index bd8db698..947a92d6 100644 --- a/test/parse/func/bad-result-multi.txt +++ b/test/parse/func/bad-result-multi.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (func (result i32 i64))) (;; STDERR ;;; -out/test/parse/func/bad-result-multi.txt:2:9: multiple result values not currently supported. +out/test/parse/func/bad-result-multi.txt:2:10: multiple result values not currently supported. (module (func (result i32 i64))) - ^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-param-type-mismatch.txt b/test/parse/func/bad-sig-param-type-mismatch.txt index 09b9840a..57aac10f 100644 --- a/test/parse/func/bad-sig-param-type-mismatch.txt +++ b/test/parse/func/bad-sig-param-type-mismatch.txt @@ -3,7 +3,7 @@ (type $t (func (param i32 f32))) (func (type $t) (param f32 f32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-param-type-mismatch.txt:4:3: type mismatch for argument 0 of function. got f32, expected i32 +out/test/parse/func/bad-sig-param-type-mismatch.txt:4:4: type mismatch for argument 0 of function. got f32, expected i32 (func (type $t) (param f32 f32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-params-empty.txt b/test/parse/func/bad-sig-params-empty.txt index ab44bbe8..8eb9e2b6 100644 --- a/test/parse/func/bad-sig-params-empty.txt +++ b/test/parse/func/bad-sig-params-empty.txt @@ -3,7 +3,7 @@ (type $t (func)) (func (type $t) (param i32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-params-empty.txt:4:3: expected 0 arguments, got 1 +out/test/parse/func/bad-sig-params-empty.txt:4:4: expected 0 arguments, got 1 (func (type $t) (param i32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-result-type-mismatch.txt b/test/parse/func/bad-sig-result-type-mismatch.txt index ce0800b9..f8634b62 100644 --- a/test/parse/func/bad-sig-result-type-mismatch.txt +++ b/test/parse/func/bad-sig-result-type-mismatch.txt @@ -3,10 +3,10 @@ (type $t (func (param i32) (result f32))) (func (type $t) (param i32) (result i64))) (;; STDERR ;;; -out/test/parse/func/bad-sig-result-type-mismatch.txt:4:3: type mismatch for result 0 of function. got i64, expected f32 +out/test/parse/func/bad-sig-result-type-mismatch.txt:4:4: type mismatch for result 0 of function. got i64, expected f32 (func (type $t) (param i32) (result i64))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/parse/func/bad-sig-result-type-mismatch.txt:4:3: type stack size too small at implicit return. got 0, expected at least 1 + ^^^^ +out/test/parse/func/bad-sig-result-type-mismatch.txt:4:4: type stack size too small at implicit return. got 0, expected at least 1 (func (type $t) (param i32) (result i64))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-result-type-not-void.txt b/test/parse/func/bad-sig-result-type-not-void.txt index 3d751f3e..a58c98f5 100644 --- a/test/parse/func/bad-sig-result-type-not-void.txt +++ b/test/parse/func/bad-sig-result-type-not-void.txt @@ -3,10 +3,10 @@ (type $t (func (param i32))) (func (type $t) (param i32) (result f32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-result-type-not-void.txt:4:3: expected 0 results, got 1 +out/test/parse/func/bad-sig-result-type-not-void.txt:4:4: expected 0 results, got 1 (func (type $t) (param i32) (result f32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/parse/func/bad-sig-result-type-not-void.txt:4:3: type stack size too small at implicit return. got 0, expected at least 1 + ^^^^ +out/test/parse/func/bad-sig-result-type-not-void.txt:4:4: type stack size too small at implicit return. got 0, expected at least 1 (func (type $t) (param i32) (result f32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-result-type-void.txt b/test/parse/func/bad-sig-result-type-void.txt index 1ac5e67d..500a4632 100644 --- a/test/parse/func/bad-sig-result-type-void.txt +++ b/test/parse/func/bad-sig-result-type-void.txt @@ -3,7 +3,7 @@ (type $t (func (param i32) (result f32))) (func (type $t) (param i32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-result-type-void.txt:4:3: expected 1 results, got 0 +out/test/parse/func/bad-sig-result-type-void.txt:4:4: expected 1 results, got 0 (func (type $t) (param i32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-too-few-params.txt b/test/parse/func/bad-sig-too-few-params.txt index 1569a886..401b00e5 100644 --- a/test/parse/func/bad-sig-too-few-params.txt +++ b/test/parse/func/bad-sig-too-few-params.txt @@ -3,7 +3,7 @@ (type $t (func (param i32 f32))) (func (type $t) (param i32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-too-few-params.txt:4:3: expected 2 arguments, got 1 +out/test/parse/func/bad-sig-too-few-params.txt:4:4: expected 2 arguments, got 1 (func (type $t) (param i32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/func/bad-sig-too-many-params.txt b/test/parse/func/bad-sig-too-many-params.txt index 04b6b39f..40427c3c 100644 --- a/test/parse/func/bad-sig-too-many-params.txt +++ b/test/parse/func/bad-sig-too-many-params.txt @@ -3,7 +3,7 @@ (type $t (func (param i32))) (func (type $t) (param i32 i32))) (;; STDERR ;;; -out/test/parse/func/bad-sig-too-many-params.txt:4:3: expected 1 arguments, got 2 +out/test/parse/func/bad-sig-too-many-params.txt:4:4: expected 1 arguments, got 2 (func (type $t) (param i32 i32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-func-redefinition.txt b/test/parse/module/bad-func-redefinition.txt index d043929f..536d2d3d 100644 --- a/test/parse/module/bad-func-redefinition.txt +++ b/test/parse/module/bad-func-redefinition.txt @@ -3,7 +3,7 @@ (func $n nop) (func $n nop)) (;; STDERR ;;; -out/test/parse/module/bad-func-redefinition.txt:4:3: redefinition of function "$n" +out/test/parse/module/bad-func-redefinition.txt:4:4: redefinition of function "$n" (func $n nop)) - ^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-global-invalid-expr.txt b/test/parse/module/bad-global-invalid-expr.txt index 2008e8fe..97d8da09 100644 --- a/test/parse/module/bad-global-invalid-expr.txt +++ b/test/parse/module/bad-global-invalid-expr.txt @@ -5,7 +5,7 @@ i32.const 2 i32.add)) (;; STDERR ;;; -out/test/parse/module/bad-global-invalid-expr.txt:3:3: invalid global initializer expression, must be a constant expression; either *.const or get_global. +out/test/parse/module/bad-global-invalid-expr.txt:3:4: invalid global initializer expression, must be a constant expression; either *.const or get_global. (global i32 - ^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-func-redefinition.txt b/test/parse/module/bad-import-func-redefinition.txt index fce8e9f2..db06946a 100644 --- a/test/parse/module/bad-import-func-redefinition.txt +++ b/test/parse/module/bad-import-func-redefinition.txt @@ -3,7 +3,7 @@ (import "bar" "baz" (func $foo (param i32))) (import "quux" "blorf" (func $foo (param f32)))) (;; STDERR ;;; -out/test/parse/module/bad-import-func-redefinition.txt:4:3: redefinition of function "$foo" +out/test/parse/module/bad-import-func-redefinition.txt:4:4: redefinition of function "$foo" (import "quux" "blorf" (func $foo (param f32)))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-global-redefinition.txt b/test/parse/module/bad-import-global-redefinition.txt index 1c269314..d5a85348 100644 --- a/test/parse/module/bad-import-global-redefinition.txt +++ b/test/parse/module/bad-import-global-redefinition.txt @@ -3,7 +3,7 @@ (import "foo" "bar" (global $baz i32)) (import "oof" "rab" (global $baz i32))) (;; STDERR ;;; -out/test/parse/module/bad-import-global-redefinition.txt:4:3: redefinition of global "$baz" +out/test/parse/module/bad-import-global-redefinition.txt:4:4: redefinition of global "$baz" (import "oof" "rab" (global $baz i32))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-memory-redefinition.txt b/test/parse/module/bad-import-memory-redefinition.txt index 5377d445..c76703a7 100644 --- a/test/parse/module/bad-import-memory-redefinition.txt +++ b/test/parse/module/bad-import-memory-redefinition.txt @@ -3,7 +3,7 @@ (import "foo" "bar" (memory $baz 0)) (import "foo" "blah" (memory $baz 0))) (;; STDERR ;;; -out/test/parse/module/bad-import-memory-redefinition.txt:4:3: redefinition of memory "$baz" +out/test/parse/module/bad-import-memory-redefinition.txt:4:4: redefinition of memory "$baz" (import "foo" "blah" (memory $baz 0))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-table-redefinition.txt b/test/parse/module/bad-import-table-redefinition.txt index 1873ef78..94556bd8 100644 --- a/test/parse/module/bad-import-table-redefinition.txt +++ b/test/parse/module/bad-import-table-redefinition.txt @@ -3,7 +3,7 @@ (import "foo" "bar" (table $baz 0 anyfunc)) (import "foo" "blah" (table $baz 0 anyfunc))) (;; STDERR ;;; -out/test/parse/module/bad-import-table-redefinition.txt:4:3: redefinition of table "$baz" +out/test/parse/module/bad-import-table-redefinition.txt:4:4: redefinition of table "$baz" (import "foo" "blah" (table $baz 0 anyfunc))) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-empty.txt b/test/parse/module/bad-memory-empty.txt index 701a7645..40b06178 100644 --- a/test/parse/module/bad-memory-empty.txt +++ b/test/parse/module/bad-memory-empty.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (memory)) (;; STDERR ;;; -out/test/parse/module/bad-memory-empty.txt:2:16: syntax error, unexpected ), expecting NAT +out/test/parse/module/bad-memory-empty.txt:2:16: syntax error, unexpected ), expecting ( or NAT (module (memory)) ^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-init-size-negative.txt b/test/parse/module/bad-memory-init-size-negative.txt index 4f7b824a..59261dd1 100644 --- a/test/parse/module/bad-memory-init-size-negative.txt +++ b/test/parse/module/bad-memory-init-size-negative.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (memory -100)) (;; STDERR ;;; -out/test/parse/module/bad-memory-init-size-negative.txt:2:17: syntax error, unexpected INT, expecting NAT +out/test/parse/module/bad-memory-init-size-negative.txt:2:17: syntax error, unexpected INT, expecting ( or NAT (module (memory -100)) ^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-init-size-too-big.txt b/test/parse/module/bad-memory-init-size-too-big.txt index 3e47a1ca..edd15663 100644 --- a/test/parse/module/bad-memory-init-size-too-big.txt +++ b/test/parse/module/bad-memory-init-size-too-big.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (memory 65537)) (;; STDERR ;;; -out/test/parse/module/bad-memory-init-size-too-big.txt:2:9: initial pages (65537) must be <= (65536) +out/test/parse/module/bad-memory-init-size-too-big.txt:2:10: initial pages (65537) must be <= (65536) (module (memory 65537)) - ^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-init-size.txt b/test/parse/module/bad-memory-init-size.txt index b3a894b0..97916071 100644 --- a/test/parse/module/bad-memory-init-size.txt +++ b/test/parse/module/bad-memory-init-size.txt @@ -4,7 +4,7 @@ out/test/parse/module/bad-memory-init-size.txt:2:17: unexpected token "foo" (module (memory foo)) ^^^ -out/test/parse/module/bad-memory-init-size.txt:2:20: syntax error, unexpected ), expecting NAT +out/test/parse/module/bad-memory-init-size.txt:2:20: syntax error, unexpected ), expecting ( or NAT (module (memory foo)) ^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-max-less-than-init.txt b/test/parse/module/bad-memory-max-less-than-init.txt index b5d74426..cc4ffd61 100644 --- a/test/parse/module/bad-memory-max-less-than-init.txt +++ b/test/parse/module/bad-memory-max-less-than-init.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (memory 2 1)) (;; STDERR ;;; -out/test/parse/module/bad-memory-max-less-than-init.txt:2:9: max pages (1) must be >= initial pages (2) +out/test/parse/module/bad-memory-max-less-than-init.txt:2:10: max pages (1) must be >= initial pages (2) (module (memory 2 1)) - ^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-max-size-too-big.txt b/test/parse/module/bad-memory-max-size-too-big.txt index 998d7e07..9df4c00b 100644 --- a/test/parse/module/bad-memory-max-size-too-big.txt +++ b/test/parse/module/bad-memory-max-size-too-big.txt @@ -1,7 +1,7 @@ ;;; ERROR: 1 (module (memory 0 65537)) (;; STDERR ;;; -out/test/parse/module/bad-memory-max-size-too-big.txt:2:9: max pages (65537) must be <= (65536) +out/test/parse/module/bad-memory-max-size-too-big.txt:2:10: max pages (65537) must be <= (65536) (module (memory 0 65537)) - ^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-memory-too-many.txt b/test/parse/module/bad-memory-too-many.txt index 944baded..8f7ffe5b 100644 --- a/test/parse/module/bad-memory-too-many.txt +++ b/test/parse/module/bad-memory-too-many.txt @@ -3,7 +3,7 @@ (memory 1) (memory 2)) (;; STDERR ;;; -out/test/parse/module/bad-memory-too-many.txt:4:3: only one memory block allowed +out/test/parse/module/bad-memory-too-many.txt:4:4: only one memory block allowed (memory 2)) - ^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-module-no-close.txt b/test/parse/module/bad-module-no-close.txt index cd4b2549..a5ad2ff0 100644 --- a/test/parse/module/bad-module-no-close.txt +++ b/test/parse/module/bad-module-no-close.txt @@ -1,5 +1,5 @@ ;;; ERROR: 1 (module (;; STDERR ;;; -out/test/parse/module/bad-module-no-close.txt:3:1: syntax error, unexpected EOF, expecting ( or ) +out/test/parse/module/bad-module-no-close.txt:3:2: syntax error, unexpected EOF, expecting ) ;;; STDERR ;;) diff --git a/test/parse/module/bad-start-not-nullary.txt b/test/parse/module/bad-start-not-nullary.txt index 5745327e..d14f34bc 100644 --- a/test/parse/module/bad-start-not-nullary.txt +++ b/test/parse/module/bad-start-not-nullary.txt @@ -3,7 +3,7 @@ (start 0) (func (param i32))) (;; STDERR ;;; -out/test/parse/module/bad-start-not-nullary.txt:3:3: start function must be nullary +out/test/parse/module/bad-start-not-nullary.txt:3:4: start function must be nullary (start 0) - ^^^^^^^^^ + ^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-start-not-void.txt b/test/parse/module/bad-start-not-void.txt index 23ee6900..297a78f3 100644 --- a/test/parse/module/bad-start-not-void.txt +++ b/test/parse/module/bad-start-not-void.txt @@ -4,7 +4,7 @@ (func (result i32) i32.const 0)) (;; STDERR ;;; -out/test/parse/module/bad-start-not-void.txt:3:3: start function must not return anything +out/test/parse/module/bad-start-not-void.txt:3:4: start function must not return anything (start 0) - ^^^^^^^^^ + ^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-start-too-many.txt b/test/parse/module/bad-start-too-many.txt index ba18c15c..c6c64d6d 100644 --- a/test/parse/module/bad-start-too-many.txt +++ b/test/parse/module/bad-start-too-many.txt @@ -5,7 +5,7 @@ (func) (func)) (;; STDERR ;;; -out/test/parse/module/bad-start-too-many.txt:4:3: only one start function allowed +out/test/parse/module/bad-start-too-many.txt:4:4: only one start function allowed (start 1) - ^^^^^^^^^ + ^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-table-too-many.txt b/test/parse/module/bad-table-too-many.txt index 7c25d640..d0d36f1c 100644 --- a/test/parse/module/bad-table-too-many.txt +++ b/test/parse/module/bad-table-too-many.txt @@ -4,7 +4,7 @@ (table anyfunc (elem 0)) (table anyfunc (elem 0))) (;; STDERR ;;; -out/test/parse/module/bad-table-too-many.txt:5:3: only one table allowed +out/test/parse/module/bad-table-too-many.txt:5:4: only one table allowed (table anyfunc (elem 0))) - ^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^ ;;; STDERR ;;) diff --git a/test/regress/regress-2.txt b/test/regress/regress-2.txt index 50023654..05e9c349 100644 --- a/test/regress/regress-2.txt +++ b/test/regress/regress-2.txt @@ -10,10 +10,10 @@ (func $memory(param f32)(call 332 )) (func $memorGe )) (;; STDERR ;;; -out/test/regress/regress-2.txt:6:3: redefinition of function "$memor" +out/test/regress/regress-2.txt:6:4: redefinition of function "$memor" (func $memor(call 2 )) - ^^^^^^^^^^^^^^^^^^^^^^ -out/test/regress/regress-2.txt:10:3: redefinition of function "$memory" + ^^^^ +out/test/regress/regress-2.txt:10:4: redefinition of function "$memory" (func $memory(param f32)(call 332 )) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^ ;;; STDERR ;;) diff --git a/test/regress/regress-6.txt b/test/regress/regress-6.txt index 98a6f802..ea8a39c4 100644 --- a/test/regress/regress-6.txt +++ b/test/regress/regress-6.txt @@ -1,6 +1,6 @@ (module (func (result i32) - block i32 + block (result i32) f32.const 1 i32.const 1 br 0 diff --git a/test/roundtrip/fold-block.txt b/test/roundtrip/fold-block.txt index a2f84d08..54f73132 100644 --- a/test/roundtrip/fold-block.txt +++ b/test/roundtrip/fold-block.txt @@ -11,20 +11,20 @@ f32.add) (func $fold-block-br-value (result i32) - block i32 + block (result i32) i32.const 1 br 0 end) (func $fold-loop - loop i64 + loop (result i64) br 0 i64.const 1 end drop) (func $fold-loop-br (result i32) - loop i32 + loop (result i32) i32.const 1 br 0 end) @@ -38,7 +38,7 @@ (func $fold-if-else i32.const 1 - if i32 + if (result i32) i32.const 2 else i32.const 3 @@ -47,7 +47,7 @@ (func $fold-if-else-br i32.const 1 - if i32 + if (result i32) i32.const 2 br 0 else @@ -67,16 +67,16 @@ (f32.const 0x1p+0 (;=1;)) (f32.add)) (func $fold-block-br-value (type 1) (result i32) - (block i32 ;; label = @1 + (block (result i32) ;; label = @1 (br 0 (;@1;) (i32.const 1)))) (func $fold-loop (type 2) (drop - (loop i64 ;; label = @1 + (loop (result i64) ;; label = @1 (br 0 (;@1;)) (i64.const 1)))) (func $fold-loop-br (type 1) (result i32) - (loop i32 ;; label = @1 + (loop (result i32) ;; label = @1 (i32.const 1) (br 0 (;@1;)))) (func $fold-if (type 2) @@ -87,7 +87,7 @@ (nop)))) (func $fold-if-else (type 2) (drop - (if i32 ;; label = @1 + (if (result i32) ;; label = @1 (i32.const 1) (then (i32.const 2)) @@ -95,7 +95,7 @@ (i32.const 3))))) (func $fold-if-else-br (type 2) (drop - (if i32 ;; label = @1 + (if (result i32) ;; label = @1 (i32.const 1) (then (br 0 (;@1;) diff --git a/test/roundtrip/label.txt b/test/roundtrip/label.txt index 02dfaebd..266f3fc3 100644 --- a/test/roundtrip/label.txt +++ b/test/roundtrip/label.txt @@ -2,7 +2,7 @@ ;;; FLAGS: --stdout (module (func (param i32) (result f32) - block f32 + block (result f32) f32.const 1 get_local 0 i32.eqz @@ -14,7 +14,7 @@ (module (type (;0;) (func (param i32) (result f32))) (func (;0;) (type 0) (param i32) (result f32) - block f32 ;; label = @1 + block (result f32) ;; label = @1 f32.const 0x1p+0 (;=1;) get_local 0 i32.eqz diff --git a/test/spec/block.txt b/test/spec/block.txt index 6079219a..140ade11 100644 --- a/test/spec/block.txt +++ b/test/spec/block.txt @@ -1,70 +1,70 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/block.wast (;; STDOUT ;;; -out/third_party/testsuite/block.wast:133: assert_invalid passed: +out/third_party/testsuite/block.wast:159: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:137: assert_invalid passed: +out/third_party/testsuite/block.wast:163: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:141: assert_invalid passed: +out/third_party/testsuite/block.wast:167: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:145: assert_invalid passed: +out/third_party/testsuite/block.wast:171: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:150: assert_invalid passed: +out/third_party/testsuite/block.wast:176: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x0000001c: OnEndExpr callback failed -out/third_party/testsuite/block.wast:156: assert_invalid passed: +out/third_party/testsuite/block.wast:182: assert_invalid passed: error: type stack size too small at block. got 0, expected at least 1 error: @0x0000001b: OnEndExpr callback failed -out/third_party/testsuite/block.wast:162: assert_invalid passed: +out/third_party/testsuite/block.wast:188: assert_invalid passed: error: type stack size too small at block. got 0, expected at least 1 error: @0x0000001c: OnEndExpr callback failed -out/third_party/testsuite/block.wast:168: assert_invalid passed: +out/third_party/testsuite/block.wast:194: assert_invalid passed: error: type mismatch in block, expected i32 but got f32. error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/block.wast:174: assert_invalid passed: +out/third_party/testsuite/block.wast:200: assert_invalid passed: error: type mismatch in implicit return, expected i32 but got i64. error: @0x00000020: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:181: assert_invalid passed: +out/third_party/testsuite/block.wast:207: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/block.wast:187: assert_invalid passed: +out/third_party/testsuite/block.wast:213: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/block.wast:194: assert_invalid passed: +out/third_party/testsuite/block.wast:220: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001d: OnBrExpr callback failed -out/third_party/testsuite/block.wast:200: assert_invalid passed: +out/third_party/testsuite/block.wast:226: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001e: OnBrExpr callback failed -out/third_party/testsuite/block.wast:206: assert_invalid passed: +out/third_party/testsuite/block.wast:232: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001d: OnBrExpr callback failed -out/third_party/testsuite/block.wast:212: assert_invalid passed: +out/third_party/testsuite/block.wast:238: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001e: OnBrExpr callback failed -out/third_party/testsuite/block.wast:219: assert_invalid passed: +out/third_party/testsuite/block.wast:245: assert_invalid passed: error: type stack at end of function is 1, expected 0 error: @0x00000024: EndFunctionBody callback failed -out/third_party/testsuite/block.wast:225: assert_invalid passed: +out/third_party/testsuite/block.wast:251: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001e: OnBrExpr callback failed -out/third_party/testsuite/block.wast:232: assert_invalid passed: +out/third_party/testsuite/block.wast:258: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001f: OnBrExpr callback failed -out/third_party/testsuite/block.wast:238: assert_invalid passed: +out/third_party/testsuite/block.wast:264: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x00000020: OnBrExpr callback failed -out/third_party/testsuite/block.wast:245: assert_invalid passed: +out/third_party/testsuite/block.wast:273: assert_invalid passed: error: type stack size too small at i32.ctz. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/block.wast:251: assert_invalid passed: +out/third_party/testsuite/block.wast:279: assert_invalid passed: error: type stack size too small at i64.ctz. got 0, expected at least 1 error: @0x0000001f: OnUnaryExpr callback failed -out/third_party/testsuite/block.wast:257: assert_invalid passed: +out/third_party/testsuite/block.wast:285: assert_invalid passed: error: type stack size too small at i64.ctz. got 0, expected at least 1 error: @0x00000020: OnUnaryExpr callback failed 36/36 tests passed. diff --git a/test/spec/br.txt b/test/spec/br.txt index f13ce3e9..fff54014 100644 --- a/test/spec/br.txt +++ b/test/spec/br.txt @@ -1,25 +1,25 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/br.wast (;; STDOUT ;;; -out/third_party/testsuite/br.wast:372: assert_invalid passed: +out/third_party/testsuite/br.wast:411: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/br.wast:379: assert_invalid passed: +out/third_party/testsuite/br.wast:418: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001d: OnBrExpr callback failed -out/third_party/testsuite/br.wast:385: assert_invalid passed: +out/third_party/testsuite/br.wast:424: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x00000020: OnBrExpr callback failed -out/third_party/testsuite/br.wast:391: assert_invalid passed: +out/third_party/testsuite/br.wast:430: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001e: OnBrExpr callback failed -out/third_party/testsuite/br.wast:398: assert_invalid passed: +out/third_party/testsuite/br.wast:437: assert_invalid passed: error: invalid depth: 1 (max 0) error: @0x00000019: OnBrExpr callback failed -out/third_party/testsuite/br.wast:402: assert_invalid passed: +out/third_party/testsuite/br.wast:441: assert_invalid passed: error: invalid depth: 5 (max 2) error: @0x0000001d: OnBrExpr callback failed -out/third_party/testsuite/br.wast:406: assert_invalid passed: +out/third_party/testsuite/br.wast:445: assert_invalid passed: error: invalid depth: 268435457 (max 0) error: @0x0000001d: OnBrExpr callback failed 68/68 tests passed. diff --git a/test/spec/br_if.txt b/test/spec/br_if.txt index eb44ab5c..41463904 100644 --- a/test/spec/br_if.txt +++ b/test/spec/br_if.txt @@ -1,76 +1,76 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/br_if.wast (;; STDOUT ;;; -out/third_party/testsuite/br_if.wast:171: assert_invalid passed: +out/third_party/testsuite/br_if.wast:191: assert_invalid passed: error: type stack size too small at i32.ctz. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/br_if.wast:175: assert_invalid passed: +out/third_party/testsuite/br_if.wast:195: assert_invalid passed: error: type stack size too small at i64.ctz. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/br_if.wast:179: assert_invalid passed: +out/third_party/testsuite/br_if.wast:199: assert_invalid passed: error: type stack size too small at f32.neg. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/br_if.wast:183: assert_invalid passed: +out/third_party/testsuite/br_if.wast:203: assert_invalid passed: error: type stack size too small at f64.neg. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/br_if.wast:188: assert_invalid passed: +out/third_party/testsuite/br_if.wast:208: assert_invalid passed: error: type stack size too small at i32.ctz. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/br_if.wast:192: assert_invalid passed: +out/third_party/testsuite/br_if.wast:212: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x0000001d: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:196: assert_invalid passed: +out/third_party/testsuite/br_if.wast:216: assert_invalid passed: error: type mismatch in br_if, expected i32 but got f32. error: @0x00000020: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:200: assert_invalid passed: +out/third_party/testsuite/br_if.wast:220: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x0000001d: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:205: assert_invalid passed: +out/third_party/testsuite/br_if.wast:225: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001e: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:211: assert_invalid passed: +out/third_party/testsuite/br_if.wast:231: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001e: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:217: assert_invalid passed: +out/third_party/testsuite/br_if.wast:237: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/br_if.wast:223: assert_invalid passed: +out/third_party/testsuite/br_if.wast:243: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/br_if.wast:230: assert_invalid passed: +out/third_party/testsuite/br_if.wast:250: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001f: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:236: assert_invalid passed: +out/third_party/testsuite/br_if.wast:256: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001f: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:242: assert_invalid passed: +out/third_party/testsuite/br_if.wast:262: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x00000020: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:248: assert_invalid passed: +out/third_party/testsuite/br_if.wast:270: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x00000020: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:255: assert_invalid passed: +out/third_party/testsuite/br_if.wast:279: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001c: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:261: assert_invalid passed: +out/third_party/testsuite/br_if.wast:285: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x0000001d: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:267: assert_invalid passed: +out/third_party/testsuite/br_if.wast:291: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x0000001f: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:273: assert_invalid passed: +out/third_party/testsuite/br_if.wast:297: assert_invalid passed: error: type stack size too small at br_if. got 0, expected at least 1 error: @0x00000022: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:279: assert_invalid passed: +out/third_party/testsuite/br_if.wast:303: assert_invalid passed: error: type mismatch in br_if, expected i32 but got i64. error: @0x00000020: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:286: assert_invalid passed: +out/third_party/testsuite/br_if.wast:310: assert_invalid passed: error: invalid depth: 1 (max 0) error: @0x0000001b: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:290: assert_invalid passed: +out/third_party/testsuite/br_if.wast:314: assert_invalid passed: error: invalid depth: 5 (max 2) error: @0x0000001f: OnBrIfExpr callback failed -out/third_party/testsuite/br_if.wast:294: assert_invalid passed: +out/third_party/testsuite/br_if.wast:318: assert_invalid passed: error: invalid depth: 268435457 (max 0) error: @0x0000001f: OnBrIfExpr callback failed 58/58 tests passed. diff --git a/test/spec/br_table.txt b/test/spec/br_table.txt index 9c34e7af..1141574f 100644 --- a/test/spec/br_table.txt +++ b/test/spec/br_table.txt @@ -1,49 +1,49 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/br_table.wast (;; STDOUT ;;; -out/third_party/testsuite/br_table.wast:1405: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1413: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000022: OnEndExpr callback failed -out/third_party/testsuite/br_table.wast:1412: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1420: assert_invalid passed: error: type stack size too small at br_table. got 0, expected at least 1 error: @0x00000020: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1418: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1426: assert_invalid passed: error: type mismatch in br_table, expected i32 but got i64. error: @0x00000023: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1424: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1434: assert_invalid passed: error: type mismatch in br_table, expected void but got f32. error: @0x00000026: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1436: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1446: assert_invalid passed: error: type stack size too small at br_table. got 0, expected at least 1 error: @0x0000001f: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1442: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1452: assert_invalid passed: error: type mismatch in br_table, expected i32 but got i64. error: @0x0000001e: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1448: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1458: assert_invalid passed: error: type stack size too small at br_table. got 0, expected at least 1 error: @0x00000021: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1454: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1464: assert_invalid passed: error: type stack size too small at br_table. got 0, expected at least 1 error: @0x00000023: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1460: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1470: assert_invalid passed: error: type mismatch in br_table, expected i32 but got i64. error: @0x00000022: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1467: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1479: assert_invalid passed: error: invalid depth: 2 (max 1) error: @0x0000001f: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1473: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1485: assert_invalid passed: error: invalid depth: 5 (max 2) error: @0x00000021: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1479: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1491: assert_invalid passed: error: invalid depth: 268435457 (max 1) error: @0x00000024: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1486: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1498: assert_invalid passed: error: invalid depth: 2 (max 1) error: @0x0000001f: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1492: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1504: assert_invalid passed: error: invalid depth: 5 (max 2) error: @0x00000021: OnBrTableExpr callback failed -out/third_party/testsuite/br_table.wast:1498: assert_invalid passed: +out/third_party/testsuite/br_table.wast:1510: assert_invalid passed: error: invalid depth: 268435457 (max 1) error: @0x00000024: OnBrTableExpr callback failed 159/159 tests passed. diff --git a/test/spec/call.txt b/test/spec/call.txt index 81f52145..de6e0572 100644 --- a/test/spec/call.txt +++ b/test/spec/call.txt @@ -1,41 +1,41 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/call.wast (;; STDOUT ;;; -out/third_party/testsuite/call.wast:151: assert_invalid passed: +out/third_party/testsuite/call.wast:160: assert_invalid passed: error: type stack size too small at i32.eqz. got 0, expected at least 1 error: @0x0000001b: OnConvertExpr callback failed -out/third_party/testsuite/call.wast:158: assert_invalid passed: +out/third_party/testsuite/call.wast:167: assert_invalid passed: error: type mismatch in i32.eqz, expected i32 but got i64. error: @0x0000001f: OnConvertExpr callback failed -out/third_party/testsuite/call.wast:166: assert_invalid passed: +out/third_party/testsuite/call.wast:175: assert_invalid passed: error: type stack size too small at call. got 0, expected at least 1 error: @0x0000001e: OnCallExpr callback failed -out/third_party/testsuite/call.wast:173: assert_invalid passed: +out/third_party/testsuite/call.wast:182: assert_invalid passed: error: type stack size too small at call. got 0, expected at least 2 error: @0x0000001f: OnCallExpr callback failed -out/third_party/testsuite/call.wast:180: assert_invalid passed: +out/third_party/testsuite/call.wast:189: assert_invalid passed: error: type stack at end of function is 1, expected 0 error: @0x0000001d: EndFunctionBody callback failed -out/third_party/testsuite/call.wast:187: assert_invalid passed: +out/third_party/testsuite/call.wast:196: assert_invalid passed: error: type stack at end of function is 2, expected 0 error: @0x00000026: EndFunctionBody callback failed -out/third_party/testsuite/call.wast:195: assert_invalid passed: +out/third_party/testsuite/call.wast:204: assert_invalid passed: error: type stack size too small at call. got 1, expected at least 2 error: @0x00000022: OnCallExpr callback failed -out/third_party/testsuite/call.wast:202: assert_invalid passed: +out/third_party/testsuite/call.wast:211: assert_invalid passed: error: type stack size too small at call. got 1, expected at least 2 error: @0x00000022: OnCallExpr callback failed -out/third_party/testsuite/call.wast:209: assert_invalid passed: +out/third_party/testsuite/call.wast:218: assert_invalid passed: error: type mismatch in call, expected i32 but got f64. error: type mismatch in call, expected f64 but got i32. error: @0x0000002a: OnCallExpr callback failed -out/third_party/testsuite/call.wast:216: assert_invalid passed: +out/third_party/testsuite/call.wast:225: assert_invalid passed: error: type mismatch in call, expected f64 but got i32. error: type mismatch in call, expected i32 but got f64. error: @0x0000002a: OnCallExpr callback failed -out/third_party/testsuite/call.wast:227: assert_invalid passed: +out/third_party/testsuite/call.wast:236: assert_invalid passed: error: @0x00000019: invalid call function index: 1 -out/third_party/testsuite/call.wast:231: assert_invalid passed: +out/third_party/testsuite/call.wast:240: assert_invalid passed: error: @0x0000001d: invalid call function index: 1012321300 47/47 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/call_indirect.txt b/test/spec/call_indirect.txt index 88d690d7..194d404f 100644 --- a/test/spec/call_indirect.txt +++ b/test/spec/call_indirect.txt @@ -1,61 +1,61 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/call_indirect.wast (;; STDOUT ;;; -out/third_party/testsuite/call_indirect.wast:229: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:237: assert_invalid passed: error: found call_indirect operator, but no table error: @0x0000001c: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:237: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:245: assert_invalid passed: error: type stack size too small at i32.eqz. got 0, expected at least 1 error: @0x00000023: OnConvertExpr callback failed -out/third_party/testsuite/call_indirect.wast:245: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:253: assert_invalid passed: error: type mismatch in i32.eqz, expected i32 but got i64. error: @0x00000027: OnConvertExpr callback failed -out/third_party/testsuite/call_indirect.wast:254: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:262: assert_invalid passed: error: type stack size too small at call_indirect. got 0, expected at least 1 error: @0x00000026: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:262: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:270: assert_invalid passed: error: type stack size too small at call_indirect. got 0, expected at least 2 error: @0x00000027: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:270: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:278: assert_invalid passed: error: type stack at end of function is 1, expected 0 error: @0x00000025: EndFunctionBody callback failed -out/third_party/testsuite/call_indirect.wast:278: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:286: assert_invalid passed: error: type stack at end of function is 2, expected 0 error: @0x0000002e: EndFunctionBody callback failed -out/third_party/testsuite/call_indirect.wast:289: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:297: assert_invalid passed: error: type stack size too small at call_indirect. got 0, expected at least 1 error: @0x00000027: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:297: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:305: assert_invalid passed: error: type mismatch in call_indirect, expected i32 but got i64. error: @0x00000028: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:306: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:314: assert_invalid passed: error: type stack size too small at call_indirect. got 1, expected at least 2 error: @0x0000002a: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:316: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:324: assert_invalid passed: error: type stack size too small at call_indirect. got 1, expected at least 2 error: @0x0000002a: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:326: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:334: assert_invalid passed: error: type mismatch in call_indirect, expected i32 but got f64. error: type mismatch in call_indirect, expected f64 but got i32. error: @0x00000032: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:336: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:344: assert_invalid passed: error: type mismatch in call_indirect, expected f64 but got i32. error: type mismatch in call_indirect, expected i32 but got f64. error: @0x00000032: OnCallIndirectExpr callback failed -out/third_party/testsuite/call_indirect.wast:350: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:358: assert_invalid passed: error: @0x00000021: invalid call_indirect signature index -out/third_party/testsuite/call_indirect.wast:357: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:365: assert_invalid passed: error: @0x00000025: invalid call_indirect signature index -out/third_party/testsuite/call_indirect.wast:368: assert_invalid passed: +out/third_party/testsuite/call_indirect.wast:376: assert_invalid passed: error: invalid func_index: 0 (max 0) error: @0x00000018: OnElemSegmentFunctionIndex callback failed -out/third_party/testsuite/call_indirect.wast:376: assert_unlinkable passed: +out/third_party/testsuite/call_indirect.wast:384: assert_unlinkable passed: error: elem segment offset is out of bounds: 10 >= max value 10 error: @0x00000021: OnElemSegmentFunctionIndex callback failed -out/third_party/testsuite/call_indirect.wast:385: assert_unlinkable passed: +out/third_party/testsuite/call_indirect.wast:393: assert_unlinkable passed: error: elem segment offset is out of bounds: 4294967295 >= max value 10 error: @0x00000021: OnElemSegmentFunctionIndex callback failed -out/third_party/testsuite/call_indirect.wast:394: assert_unlinkable passed: +out/third_party/testsuite/call_indirect.wast:402: assert_unlinkable passed: error: elem segment offset is out of bounds: 4294967286 >= max value 10 error: @0x00000021: OnElemSegmentFunctionIndex callback failed 67/67 tests passed. diff --git a/test/spec/exports.txt b/test/spec/exports.txt index 2014b31f..203d2bb9 100644 --- a/test/spec/exports.txt +++ b/test/spec/exports.txt @@ -1,66 +1,66 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/exports.wast (;; STDOUT ;;; -out/third_party/testsuite/exports.wast:27: assert_invalid passed: +out/third_party/testsuite/exports.wast:29: assert_invalid passed: error: @0x00000019: invalid export func index: 1 -out/third_party/testsuite/exports.wast:31: assert_invalid passed: +out/third_party/testsuite/exports.wast:33: assert_invalid passed: error: duplicate export "a" error: @0x0000001d: OnExport callback failed -out/third_party/testsuite/exports.wast:35: assert_invalid passed: +out/third_party/testsuite/exports.wast:37: assert_invalid passed: error: duplicate export "a" error: @0x0000001e: OnExport callback failed -out/third_party/testsuite/exports.wast:39: assert_invalid passed: +out/third_party/testsuite/exports.wast:41: assert_invalid passed: error: duplicate export "a" error: @0x00000025: OnExport callback failed -out/third_party/testsuite/exports.wast:43: assert_invalid passed: +out/third_party/testsuite/exports.wast:45: assert_invalid passed: error: duplicate export "a" error: @0x00000023: OnExport callback failed -out/third_party/testsuite/exports.wast:47: assert_invalid passed: +out/third_party/testsuite/exports.wast:49: assert_invalid passed: error: duplicate export "a" error: @0x00000022: OnExport callback failed -out/third_party/testsuite/exports.wast:76: assert_invalid passed: +out/third_party/testsuite/exports.wast:78: assert_invalid passed: error: @0x00000017: invalid export global index: 1 -out/third_party/testsuite/exports.wast:80: assert_invalid passed: +out/third_party/testsuite/exports.wast:82: assert_invalid passed: error: duplicate export "a" error: @0x0000001b: OnExport callback failed -out/third_party/testsuite/exports.wast:84: assert_invalid passed: +out/third_party/testsuite/exports.wast:86: assert_invalid passed: error: duplicate export "a" error: @0x00000020: OnExport callback failed -out/third_party/testsuite/exports.wast:88: assert_invalid passed: +out/third_party/testsuite/exports.wast:90: assert_invalid passed: error: duplicate export "a" error: @0x00000025: OnExport callback failed -out/third_party/testsuite/exports.wast:92: assert_invalid passed: +out/third_party/testsuite/exports.wast:94: assert_invalid passed: error: duplicate export "a" error: @0x00000021: OnExport callback failed -out/third_party/testsuite/exports.wast:96: assert_invalid passed: +out/third_party/testsuite/exports.wast:98: assert_invalid passed: error: duplicate export "a" error: @0x00000020: OnExport callback failed -out/third_party/testsuite/exports.wast:124: assert_invalid passed: +out/third_party/testsuite/exports.wast:126: assert_invalid passed: error: @0x00000015: invalid export table index: 1 -out/third_party/testsuite/exports.wast:128: assert_invalid passed: +out/third_party/testsuite/exports.wast:130: assert_invalid passed: error: duplicate export "a" error: @0x00000019: OnExport callback failed -out/third_party/testsuite/exports.wast:137: assert_invalid passed: +out/third_party/testsuite/exports.wast:139: assert_invalid passed: error: duplicate export "a" error: @0x00000023: OnExport callback failed -out/third_party/testsuite/exports.wast:141: assert_invalid passed: +out/third_party/testsuite/exports.wast:143: assert_invalid passed: error: duplicate export "a" error: @0x00000021: OnExport callback failed -out/third_party/testsuite/exports.wast:145: assert_invalid passed: +out/third_party/testsuite/exports.wast:147: assert_invalid passed: error: duplicate export "a" error: @0x0000001e: OnExport callback failed -out/third_party/testsuite/exports.wast:173: assert_invalid passed: +out/third_party/testsuite/exports.wast:175: assert_invalid passed: error: @0x00000014: invalid export memory index: 1 -out/third_party/testsuite/exports.wast:177: assert_invalid passed: +out/third_party/testsuite/exports.wast:179: assert_invalid passed: error: duplicate export "a" error: @0x00000018: OnExport callback failed -out/third_party/testsuite/exports.wast:186: assert_invalid passed: +out/third_party/testsuite/exports.wast:188: assert_invalid passed: error: duplicate export "a" error: @0x00000022: OnExport callback failed -out/third_party/testsuite/exports.wast:190: assert_invalid passed: +out/third_party/testsuite/exports.wast:192: assert_invalid passed: error: duplicate export "a" error: @0x00000020: OnExport callback failed -out/third_party/testsuite/exports.wast:194: assert_invalid passed: +out/third_party/testsuite/exports.wast:196: assert_invalid passed: error: duplicate export "a" error: @0x0000001e: OnExport callback failed 28/28 tests passed. diff --git a/test/spec/func.txt b/test/spec/func.txt index c3500314..2597b206 100644 --- a/test/spec/func.txt +++ b/test/spec/func.txt @@ -1,92 +1,92 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/func.wast (;; STDOUT ;;; -out/third_party/testsuite/func.wast:315: assert_invalid passed: +out/third_party/testsuite/func.wast:317: assert_invalid passed: error: type mismatch in implicit return, expected i64 but got i32. error: @0x0000001d: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:319: assert_invalid passed: +out/third_party/testsuite/func.wast:321: assert_invalid passed: error: type mismatch in i32.eqz, expected i32 but got f32. error: @0x0000001c: OnConvertExpr callback failed -out/third_party/testsuite/func.wast:323: assert_invalid passed: +out/third_party/testsuite/func.wast:325: assert_invalid passed: error: type mismatch in f64.neg, expected f64 but got i64. error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/func.wast:331: assert_invalid passed: +out/third_party/testsuite/func.wast:333: assert_invalid passed: error: type mismatch in implicit return, expected i64 but got i32. error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:335: assert_invalid passed: +out/third_party/testsuite/func.wast:337: assert_invalid passed: error: type mismatch in i32.eqz, expected i32 but got f32. error: @0x0000001b: OnConvertExpr callback failed -out/third_party/testsuite/func.wast:339: assert_invalid passed: +out/third_party/testsuite/func.wast:341: assert_invalid passed: error: type mismatch in f64.neg, expected f64 but got i64. error: @0x0000001c: OnUnaryExpr callback failed -out/third_party/testsuite/func.wast:347: assert_invalid passed: +out/third_party/testsuite/func.wast:349: assert_invalid passed: error: @0x0000000e: result count must be 0 or 1 -out/third_party/testsuite/func.wast:351: assert_invalid passed: +out/third_party/testsuite/func.wast:353: assert_invalid passed: error: @0x0000000e: result count must be 0 or 1 -out/third_party/testsuite/func.wast:360: assert_invalid passed: +out/third_party/testsuite/func.wast:362: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000019: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:364: assert_invalid passed: +out/third_party/testsuite/func.wast:366: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000019: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:368: assert_invalid passed: +out/third_party/testsuite/func.wast:370: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000019: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:372: assert_invalid passed: +out/third_party/testsuite/func.wast:374: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000019: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:377: assert_invalid passed: +out/third_party/testsuite/func.wast:379: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001a: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:383: assert_invalid passed: +out/third_party/testsuite/func.wast:385: assert_invalid passed: error: type stack at end of function is 1, expected 0 error: @0x0000001a: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:389: assert_invalid passed: +out/third_party/testsuite/func.wast:391: assert_invalid passed: error: type mismatch in implicit return, expected i32 but got f32. error: @0x0000001e: EndFunctionBody callback failed -out/third_party/testsuite/func.wast:396: assert_invalid passed: +out/third_party/testsuite/func.wast:398: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x00000019: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:402: assert_invalid passed: +out/third_party/testsuite/func.wast:404: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x0000001a: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:408: assert_invalid passed: +out/third_party/testsuite/func.wast:410: assert_invalid passed: error: type mismatch in return, expected i32 but got i64. error: @0x0000001b: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:415: assert_invalid passed: +out/third_party/testsuite/func.wast:417: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x00000019: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:421: assert_invalid passed: +out/third_party/testsuite/func.wast:423: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x0000001a: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:427: assert_invalid passed: +out/third_party/testsuite/func.wast:429: assert_invalid passed: error: type mismatch in return, expected i32 but got i64. error: @0x0000001b: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:433: assert_invalid passed: +out/third_party/testsuite/func.wast:435: assert_invalid passed: error: type mismatch in return, expected i32 but got i64. error: @0x0000001b: OnReturnExpr callback failed -out/third_party/testsuite/func.wast:440: assert_invalid passed: +out/third_party/testsuite/func.wast:442: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001a: OnBrExpr callback failed -out/third_party/testsuite/func.wast:446: assert_invalid passed: +out/third_party/testsuite/func.wast:448: assert_invalid passed: error: type mismatch in br, expected i32 but got f32. error: @0x0000001f: OnBrExpr callback failed -out/third_party/testsuite/func.wast:452: assert_invalid passed: +out/third_party/testsuite/func.wast:454: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001a: OnBrExpr callback failed -out/third_party/testsuite/func.wast:458: assert_invalid passed: +out/third_party/testsuite/func.wast:460: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/func.wast:464: assert_invalid passed: +out/third_party/testsuite/func.wast:466: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/func.wast:471: assert_invalid passed: +out/third_party/testsuite/func.wast:473: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001c: OnBrExpr callback failed -out/third_party/testsuite/func.wast:477: assert_invalid passed: +out/third_party/testsuite/func.wast:479: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001d: OnBrExpr callback failed -out/third_party/testsuite/func.wast:483: assert_invalid passed: +out/third_party/testsuite/func.wast:485: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x0000001e: OnBrExpr callback failed 96/96 tests passed. diff --git a/test/spec/if.txt b/test/spec/if.txt index d1830159..17248fb8 100644 --- a/test/spec/if.txt +++ b/test/spec/if.txt @@ -89,19 +89,19 @@ out/third_party/testsuite/if.wast:348: assert_invalid passed: out/third_party/testsuite/if.wast:354: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001e: OnBrExpr callback failed -out/third_party/testsuite/if.wast:360: assert_invalid passed: +out/third_party/testsuite/if.wast:363: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x00000021: OnBrExpr callback failed -out/third_party/testsuite/if.wast:366: assert_invalid passed: +out/third_party/testsuite/if.wast:372: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x0000001f: OnBrExpr callback failed -out/third_party/testsuite/if.wast:372: assert_invalid passed: +out/third_party/testsuite/if.wast:381: assert_invalid passed: error: type stack size too small at br. got 0, expected at least 1 error: @0x00000022: OnBrExpr callback failed -out/third_party/testsuite/if.wast:379: assert_invalid passed: +out/third_party/testsuite/if.wast:391: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x00000020: OnBrExpr callback failed -out/third_party/testsuite/if.wast:385: assert_invalid passed: +out/third_party/testsuite/if.wast:400: assert_invalid passed: error: type mismatch in br, expected i32 but got i64. error: @0x00000023: OnBrExpr callback failed 72/72 tests passed. diff --git a/test/spec/imports.txt b/test/spec/imports.txt index 77b4dea9..cb59a9f9 100644 --- a/test/spec/imports.txt +++ b/test/spec/imports.txt @@ -11,188 +11,188 @@ called host spectest.print(f64:25.000000, f64:53.000000) => called host spectest.print(f64:24.000000) => called host spectest.print(f64:24.000000) => called host spectest.print(f64:24.000000) => -out/third_party/testsuite/imports.wast:89: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:95: assert_unlinkable passed: error: unknown module field "unknown" error: @0x00000020: OnImport callback failed -out/third_party/testsuite/imports.wast:93: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:99: assert_unlinkable passed: error: unknown host function import "spectest.unknown" error: @0x00000024: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:98: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:104: assert_unlinkable passed: error: import signature mismatch error: @0x0000001e: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:102: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:108: assert_unlinkable passed: error: import signature mismatch error: @0x0000001e: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:106: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:112: assert_unlinkable passed: error: import signature mismatch error: @0x0000001f: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:110: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:116: assert_unlinkable passed: error: import signature mismatch error: @0x00000021: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:114: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:120: assert_unlinkable passed: error: import signature mismatch error: @0x00000022: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:118: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:124: assert_unlinkable passed: error: import signature mismatch error: @0x00000022: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:122: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:128: assert_unlinkable passed: error: import signature mismatch error: @0x00000022: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:126: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:132: assert_unlinkable passed: error: import signature mismatch error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:130: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:136: assert_unlinkable passed: error: import signature mismatch error: @0x00000022: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:134: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:140: assert_unlinkable passed: error: import signature mismatch error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:138: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:144: assert_unlinkable passed: error: import signature mismatch error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:142: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:148: assert_unlinkable passed: error: import signature mismatch error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:146: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:152: assert_unlinkable passed: error: import signature mismatch error: @0x00000024: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:150: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:156: assert_unlinkable passed: error: import signature mismatch error: @0x00000026: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:154: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:160: assert_unlinkable passed: error: import signature mismatch error: @0x00000027: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:158: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:164: assert_unlinkable passed: error: import signature mismatch error: @0x00000027: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:163: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:169: assert_unlinkable passed: error: expected import "test.global-i32" to have kind func, not global error: @0x00000024: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:167: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:173: assert_unlinkable passed: error: expected import "test.table-10-inf" to have kind func, not table error: @0x00000025: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:171: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:177: assert_unlinkable passed: error: expected import "test.memory-2-inf" to have kind func, not memory error: @0x00000025: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:175: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:181: assert_unlinkable passed: error: unknown host function import "spectest.global" error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:179: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:185: assert_unlinkable passed: error: unknown host function import "spectest.table" error: @0x00000022: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:183: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:189: assert_unlinkable passed: error: unknown host function import "spectest.memory" error: @0x00000023: OnImportFunc callback failed -out/third_party/testsuite/imports.wast:217: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:223: assert_unlinkable passed: error: unknown module field "unknown" error: @0x0000001b: OnImport callback failed -out/third_party/testsuite/imports.wast:221: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:227: assert_unlinkable passed: error: unknown host global import "spectest.unknown" error: @0x0000001f: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:226: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:232: assert_unlinkable passed: error: expected import "test.func" to have kind global, not func error: @0x00000018: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:230: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:236: assert_unlinkable passed: error: expected import "test.table-10-inf" to have kind global, not table error: @0x00000020: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:234: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:240: assert_unlinkable passed: error: expected import "test.memory-2-inf" to have kind global, not memory error: @0x00000020: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:238: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:244: assert_unlinkable passed: error: unknown host global import "spectest.print" error: @0x0000001d: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:242: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:248: assert_unlinkable passed: error: unknown host global import "spectest.table" error: @0x0000001d: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:246: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:252: assert_unlinkable passed: error: unknown host global import "spectest.memory" error: @0x0000001e: OnImportGlobal callback failed -out/third_party/testsuite/imports.wast:288: assert_invalid passed: +out/third_party/testsuite/imports.wast:294: assert_invalid passed: error: unknown import module "" error: @0x00000011: OnImport callback failed -out/third_party/testsuite/imports.wast:292: assert_invalid passed: +out/third_party/testsuite/imports.wast:298: assert_invalid passed: error: unknown import module "" error: @0x00000011: OnImport callback failed -out/third_party/testsuite/imports.wast:296: assert_invalid passed: +out/third_party/testsuite/imports.wast:302: assert_invalid passed: error: @0x0000000b: table count (2) must be 0 or 1 -out/third_party/testsuite/imports.wast:313: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:319: assert_unlinkable passed: error: unknown module field "unknown" error: @0x0000001c: OnImport callback failed -out/third_party/testsuite/imports.wast:317: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:323: assert_unlinkable passed: error: unknown host table import "spectest.unknown" error: @0x00000020: OnImportTable callback failed -out/third_party/testsuite/imports.wast:322: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:328: assert_unlinkable passed: error: actual size (10) smaller than declared (12) error: @0x00000021: OnImportTable callback failed -out/third_party/testsuite/imports.wast:326: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:332: assert_unlinkable passed: error: max size (unspecified) larger than declared (20) error: @0x00000022: OnImportTable callback failed -out/third_party/testsuite/imports.wast:330: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:336: assert_unlinkable passed: error: actual size (10) smaller than declared (12) error: @0x0000001e: OnImportTable callback failed -out/third_party/testsuite/imports.wast:334: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:340: assert_unlinkable passed: error: max size (20) larger than declared (15) error: @0x0000001f: OnImportTable callback failed -out/third_party/testsuite/imports.wast:339: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:345: assert_unlinkable passed: error: expected import "test.func" to have kind table, not func error: @0x00000019: OnImportTable callback failed -out/third_party/testsuite/imports.wast:343: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:349: assert_unlinkable passed: error: expected import "test.global-i32" to have kind table, not global error: @0x0000001f: OnImportTable callback failed -out/third_party/testsuite/imports.wast:347: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:353: assert_unlinkable passed: error: expected import "test.memory-2-inf" to have kind table, not memory error: @0x00000021: OnImportTable callback failed -out/third_party/testsuite/imports.wast:351: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:357: assert_unlinkable passed: error: unknown host table import "spectest.print" error: @0x0000001e: OnImportTable callback failed -out/third_party/testsuite/imports.wast:383: assert_invalid passed: +out/third_party/testsuite/imports.wast:389: assert_invalid passed: error: unknown import module "" error: @0x00000010: OnImport callback failed -out/third_party/testsuite/imports.wast:387: assert_invalid passed: +out/third_party/testsuite/imports.wast:393: assert_invalid passed: error: unknown import module "" error: @0x00000010: OnImport callback failed -out/third_party/testsuite/imports.wast:391: assert_invalid passed: +out/third_party/testsuite/imports.wast:397: assert_invalid passed: error: @0x0000000b: memory count must be 0 or 1 -out/third_party/testsuite/imports.wast:406: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:412: assert_unlinkable passed: error: unknown module field "unknown" error: @0x0000001b: OnImport callback failed -out/third_party/testsuite/imports.wast:410: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:416: assert_unlinkable passed: error: unknown host memory import "spectest.unknown" error: @0x0000001f: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:415: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:421: assert_unlinkable passed: error: actual size (2) smaller than declared (3) error: @0x00000020: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:419: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:425: assert_unlinkable passed: error: max size (unspecified) larger than declared (3) error: @0x00000021: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:423: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:429: assert_unlinkable passed: error: actual size (1) smaller than declared (2) error: @0x0000001e: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:427: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:433: assert_unlinkable passed: error: max size (2) larger than declared (1) error: @0x0000001f: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:432: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:438: assert_unlinkable passed: error: expected import "test.func-i32" to have kind memory, not func error: @0x0000001c: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:436: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:442: assert_unlinkable passed: error: expected import "test.global-i32" to have kind memory, not global error: @0x0000001e: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:440: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:446: assert_unlinkable passed: error: expected import "test.table-10-inf" to have kind memory, not table error: @0x00000020: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:444: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:450: assert_unlinkable passed: error: unknown host memory import "spectest.print" error: @0x0000001d: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:448: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:454: assert_unlinkable passed: error: unknown host memory import "spectest.global" error: @0x0000001e: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:452: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:458: assert_unlinkable passed: error: unknown host memory import "spectest.table" error: @0x0000001d: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:457: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:463: assert_unlinkable passed: error: actual size (1) smaller than declared (2) error: @0x0000001e: OnImportMemory callback failed -out/third_party/testsuite/imports.wast:461: assert_unlinkable passed: +out/third_party/testsuite/imports.wast:467: assert_unlinkable passed: error: max size (2) larger than declared (1) error: @0x0000001f: OnImportMemory callback failed 91/91 tests passed. diff --git a/test/spec/inline-module.txt b/test/spec/inline-module.txt new file mode 100644 index 00000000..194333c5 --- /dev/null +++ b/test/spec/inline-module.txt @@ -0,0 +1,5 @@ +;;; TOOL: run-interp-spec +;;; STDIN_FILE: third_party/testsuite/inline-module.wast +(;; STDOUT ;;; +0/0 tests passed. +;;; STDOUT ;;) diff --git a/test/spec/labels.txt b/test/spec/labels.txt index 0456ff48..691004ed 100644 --- a/test/spec/labels.txt +++ b/test/spec/labels.txt @@ -1,13 +1,13 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/labels.wast (;; STDOUT ;;; -out/third_party/testsuite/labels.wast:298: assert_invalid passed: +out/third_party/testsuite/labels.wast:303: assert_invalid passed: error: type stack size too small at f32.neg. got 0, expected at least 1 error: @0x0000001e: OnUnaryExpr callback failed -out/third_party/testsuite/labels.wast:302: assert_invalid passed: +out/third_party/testsuite/labels.wast:307: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000023: OnEndExpr callback failed -out/third_party/testsuite/labels.wast:306: assert_invalid passed: +out/third_party/testsuite/labels.wast:311: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000023: OnEndExpr callback failed 27/27 tests passed. diff --git a/test/spec/loop.txt b/test/spec/loop.txt index cf142217..962a8537 100644 --- a/test/spec/loop.txt +++ b/test/spec/loop.txt @@ -1,31 +1,31 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/loop.wast (;; STDOUT ;;; -out/third_party/testsuite/loop.wast:226: assert_invalid passed: +out/third_party/testsuite/loop.wast:254: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/loop.wast:230: assert_invalid passed: +out/third_party/testsuite/loop.wast:258: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/loop.wast:234: assert_invalid passed: +out/third_party/testsuite/loop.wast:262: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/loop.wast:238: assert_invalid passed: +out/third_party/testsuite/loop.wast:266: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001c: EndFunctionBody callback failed -out/third_party/testsuite/loop.wast:243: assert_invalid passed: +out/third_party/testsuite/loop.wast:271: assert_invalid passed: error: type stack at end of loop is 1, expected 0 error: @0x0000001c: OnEndExpr callback failed -out/third_party/testsuite/loop.wast:249: assert_invalid passed: +out/third_party/testsuite/loop.wast:277: assert_invalid passed: error: type stack size too small at loop. got 0, expected at least 1 error: @0x0000001b: OnEndExpr callback failed -out/third_party/testsuite/loop.wast:255: assert_invalid passed: +out/third_party/testsuite/loop.wast:283: assert_invalid passed: error: type stack size too small at loop. got 0, expected at least 1 error: @0x0000001c: OnEndExpr callback failed -out/third_party/testsuite/loop.wast:261: assert_invalid passed: +out/third_party/testsuite/loop.wast:289: assert_invalid passed: error: type mismatch in loop, expected i32 but got f32. error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/loop.wast:267: assert_invalid passed: +out/third_party/testsuite/loop.wast:295: assert_invalid passed: error: type mismatch in implicit return, expected i32 but got i64. error: @0x00000020: EndFunctionBody callback failed 51/51 tests passed. diff --git a/test/spec/nop.txt b/test/spec/nop.txt index 53c89ded..09058c56 100644 --- a/test/spec/nop.txt +++ b/test/spec/nop.txt @@ -1,9 +1,6 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/nop.wast (;; STDOUT ;;; -out/third_party/testsuite/nop.wast:246: assert_invalid passed: - error: type stack size too small at implicit return. got 0, expected at least 1 - error: @0x0000001a: EndFunctionBody callback failed out/third_party/testsuite/nop.wast:250: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001a: EndFunctionBody callback failed @@ -13,5 +10,8 @@ out/third_party/testsuite/nop.wast:254: assert_invalid passed: out/third_party/testsuite/nop.wast:258: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001a: EndFunctionBody callback failed +out/third_party/testsuite/nop.wast:262: assert_invalid passed: + error: type stack size too small at implicit return. got 0, expected at least 1 + error: @0x0000001a: EndFunctionBody callback failed 54/54 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/return.txt b/test/spec/return.txt index 2ef78c95..5b4c48df 100644 --- a/test/spec/return.txt +++ b/test/spec/return.txt @@ -1,13 +1,13 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/return.wast (;; STDOUT ;;; -out/third_party/testsuite/return.wast:270: assert_invalid passed: +out/third_party/testsuite/return.wast:276: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x00000019: OnReturnExpr callback failed -out/third_party/testsuite/return.wast:274: assert_invalid passed: +out/third_party/testsuite/return.wast:280: assert_invalid passed: error: type stack size too small at return. got 0, expected at least 1 error: @0x0000001a: OnReturnExpr callback failed -out/third_party/testsuite/return.wast:278: assert_invalid passed: +out/third_party/testsuite/return.wast:284: assert_invalid passed: error: type mismatch in return, expected f64 but got i64. error: @0x0000001b: OnReturnExpr callback failed 60/60 tests passed. diff --git a/test/spec/token-keyword-separation.fail.txt b/test/spec/token-keyword-separation.fail.txt new file mode 100644 index 00000000..2ff2b48f --- /dev/null +++ b/test/spec/token-keyword-separation.fail.txt @@ -0,0 +1,13 @@ +;;; ERROR: 1 +;;; TOOL: run-interp-spec +;;; STDIN_FILE: third_party/testsuite/token-keyword-separation.fail.wast +(;; STDERR ;;; +Error running "wast2wasm": +out/third_party/testsuite/token-keyword-separation.fail.wast:1:22: unexpected token "i32.const0" +(module (func (drop (i32.const0)))) + ^^^^^^^^^^ +out/third_party/testsuite/token-keyword-separation.fail.wast:1:32: syntax error, unexpected ) +(module (func (drop (i32.const0)))) + ^ + +;;; STDERR ;;) diff --git a/test/spec/token-number-separation.fail.txt b/test/spec/token-number-separation.fail.txt new file mode 100644 index 00000000..a2986bd1 --- /dev/null +++ b/test/spec/token-number-separation.fail.txt @@ -0,0 +1,13 @@ +;;; ERROR: 1 +;;; TOOL: run-interp-spec +;;; STDIN_FILE: third_party/testsuite/token-number-separation.fail.wast +(;; STDERR ;;; +Error running "wast2wasm": +out/third_party/testsuite/token-number-separation.fail.wast:1:18: unexpected token "0drop" +(module (func br 0drop)) + ^^^^^ +out/third_party/testsuite/token-number-separation.fail.wast:1:23: syntax error, unexpected ), expecting NAT or VAR +(module (func br 0drop)) + ^ + +;;; STDERR ;;) diff --git a/test/spec/unreached-invalid.txt b/test/spec/unreached-invalid.txt index a261de5b..443e3092 100644 --- a/test/spec/unreached-invalid.txt +++ b/test/spec/unreached-invalid.txt @@ -279,34 +279,34 @@ out/third_party/testsuite/unreached-invalid.wast:549: assert_invalid passed: out/third_party/testsuite/unreached-invalid.wast:555: assert_invalid passed: error: type mismatch in block, expected i32 but got i64. error: @0x00000027: OnEndExpr callback failed -out/third_party/testsuite/unreached-invalid.wast:561: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:563: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000024: OnEndExpr callback failed -out/third_party/testsuite/unreached-invalid.wast:568: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:570: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/unreached-invalid.wast:574: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:576: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000022: EndFunctionBody callback failed -out/third_party/testsuite/unreached-invalid.wast:580: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:582: assert_invalid passed: error: type mismatch in implicit return, expected i32 but got i64. error: @0x00000024: EndFunctionBody callback failed -out/third_party/testsuite/unreached-invalid.wast:586: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:588: assert_invalid passed: error: type stack at end of block is 1, expected 0 error: @0x00000025: OnEndExpr callback failed -out/third_party/testsuite/unreached-invalid.wast:594: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:596: assert_invalid passed: error: type stack at end of loop is 1, expected 0 error: @0x00000020: OnEndExpr callback failed -out/third_party/testsuite/unreached-invalid.wast:600: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:602: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000020: EndFunctionBody callback failed -out/third_party/testsuite/unreached-invalid.wast:606: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:608: assert_invalid passed: error: type mismatch in implicit return, expected i32 but got i64. error: @0x00000022: EndFunctionBody callback failed -out/third_party/testsuite/unreached-invalid.wast:613: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:615: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x0000001f: EndFunctionBody callback failed -out/third_party/testsuite/unreached-invalid.wast:619: assert_invalid passed: +out/third_party/testsuite/unreached-invalid.wast:621: assert_invalid passed: error: type stack size too small at implicit return. got 0, expected at least 1 error: @0x00000020: EndFunctionBody callback failed 100/100 tests passed. diff --git a/test/typecheck/bad-global-no-init-expr.txt b/test/typecheck/bad-global-no-init-expr.txt index 1e965b7b..67232d45 100644 --- a/test/typecheck/bad-global-no-init-expr.txt +++ b/test/typecheck/bad-global-no-init-expr.txt @@ -3,10 +3,10 @@ (global i32) (global (mut f32))) (;; STDERR ;;; -out/test/typecheck/bad-global-no-init-expr.txt:3:3: type mismatch at global initializer expression. got void, expected i32 +out/test/typecheck/bad-global-no-init-expr.txt:3:4: type mismatch at global initializer expression. got void, expected i32 (global i32) - ^^^^^^^^^^^^ -out/test/typecheck/bad-global-no-init-expr.txt:4:3: type mismatch at global initializer expression. got void, expected f32 + ^^^^^^ +out/test/typecheck/bad-global-no-init-expr.txt:4:4: type mismatch at global initializer expression. got void, expected f32 (global (mut f32))) - ^^^^^^^^^^^^^^^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-if-condition-type-mismatch.txt b/test/typecheck/bad-if-condition-type-mismatch.txt index e3af0879..87b94f57 100644 --- a/test/typecheck/bad-if-condition-type-mismatch.txt +++ b/test/typecheck/bad-if-condition-type-mismatch.txt @@ -2,7 +2,7 @@ (module (func f32.const 0 - if i32 + if (result i32) i32.const 0 else i32.const 0 @@ -11,6 +11,6 @@ ) (;; STDERR ;;; out/test/typecheck/bad-if-condition-type-mismatch.txt:5:5: type mismatch in if, expected i32 but got f32. - if i32 + if (result i32) ^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-if-type-mismatch.txt b/test/typecheck/bad-if-type-mismatch.txt index e35bcd21..a5f4a27d 100644 --- a/test/typecheck/bad-if-type-mismatch.txt +++ b/test/typecheck/bad-if-type-mismatch.txt @@ -2,7 +2,7 @@ (module (func i32.const 0 - if i32 + if (result i32) f32.const 0 else i32.const 0 diff --git a/test/typecheck/bad-if-value-void.txt b/test/typecheck/bad-if-value-void.txt index e9b26c10..b750d16b 100644 --- a/test/typecheck/bad-if-value-void.txt +++ b/test/typecheck/bad-if-value-void.txt @@ -3,7 +3,7 @@ (func block $b i32.const 0 - if f32 + if (result f32) nop else f32.const 0 diff --git a/test/typecheck/br-table-loop.txt b/test/typecheck/br-table-loop.txt index d3fc35a7..84026020 100644 --- a/test/typecheck/br-table-loop.txt +++ b/test/typecheck/br-table-loop.txt @@ -2,7 +2,7 @@ (table 0 anyfunc) (memory $0 17) (func $foo (param $0 i32) (result i32) - (loop $label$1 i32 + (loop $label$1 (result i32) (block $label$2 (br_table $label$1 $label$2 $label$2 (get_local $0) diff --git a/test/typecheck/if-value.txt b/test/typecheck/if-value.txt index 1b120c56..2fa1cf81 100644 --- a/test/typecheck/if-value.txt +++ b/test/typecheck/if-value.txt @@ -1,7 +1,7 @@ (module (func (result i32) i32.const 0 - if i32 + if (result i32) i32.const 1 else i32.const 2 diff --git a/test/typecheck/label-redefinition.txt b/test/typecheck/label-redefinition.txt index 8a7203ba..b3d5d980 100644 --- a/test/typecheck/label-redefinition.txt +++ b/test/typecheck/label-redefinition.txt @@ -1,10 +1,10 @@ (module (func (result i32) - block $l1 i32 - block $l1 i32 + block $l1 (result i32) + block $l1 (result i32) i32.const 2 end - block $l1 i32 + block $l1 (result i32) i32.const 3 br $l1 end |