diff options
-rw-r--r-- | src/type-checker.cc | 2 | ||||
-rw-r--r-- | test/spec/select.txt | 24 | ||||
-rw-r--r-- | test/typecheck/bad-select-cond.txt | 8 | ||||
-rw-r--r-- | test/typecheck/bad-select-value0.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-select-value1.txt | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/type-checker.cc b/src/type-checker.cc index d4a18046..6a224d8f 100644 --- a/src/type-checker.cc +++ b/src/type-checker.cc @@ -711,7 +711,7 @@ Result TypeChecker::OnSelect() { result |= PeekAndCheckType(0, Type::I32); result |= PeekType(1, &type); result |= PeekAndCheckType(2, type); - PrintStackIfFailed(result, "select", Type::I32, type, type); + PrintStackIfFailed(result, "select", type, type, Type::I32); result |= DropTypes(3); PushType(type); return result; diff --git a/test/spec/select.txt b/test/spec/select.txt index 4bb72de4..9ec4e5bd 100644 --- a/test/spec/select.txt +++ b/test/spec/select.txt @@ -2,49 +2,49 @@ ;;; STDIN_FILE: third_party/testsuite/select.wast (;; STDOUT ;;; out/test/spec/select.wast:290: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [i32] + error: type mismatch in select, expected [any, any, i32] but got [i32] 000001c: error: OnSelectExpr callback failed out/test/spec/select.wast:297: assert_invalid passed: - error: type mismatch in select, expected [i32, i64, i64] but got [i32, i64, i32] + error: type mismatch in select, expected [i64, i64, i32] but got [i32, i64, i32] 000001e: error: OnSelectExpr callback failed out/test/spec/select.wast:301: assert_invalid passed: - error: type mismatch in select, expected [i32, f32, f32] but got [i32, f32, i32] + error: type mismatch in select, expected [f32, f32, i32] but got [i32, f32, i32] 0000021: error: OnSelectExpr callback failed out/test/spec/select.wast:305: assert_invalid passed: - error: type mismatch in select, expected [i32, f64, f64] but got [i32, f64, i32] + error: type mismatch in select, expected [f64, f64, i32] but got [i32, f64, i32] 0000025: error: OnSelectExpr callback failed out/test/spec/select.wast:311: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [] + error: type mismatch in select, expected [any, any, i32] but got [] 0000018: error: OnSelectExpr callback failed out/test/spec/select.wast:319: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [i32] + error: type mismatch in select, expected [any, any, i32] but got [i32] 000001a: error: OnSelectExpr callback failed out/test/spec/select.wast:327: assert_invalid passed: error: type mismatch in select, expected [i32, i32, i32] but got [i32, i32] 000001c: error: OnSelectExpr callback failed out/test/spec/select.wast:335: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [] + error: type mismatch in select, expected [any, any, i32] but got [] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:344: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [i32] + error: type mismatch in select, expected [any, any, i32] but got [i32] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:353: assert_invalid passed: error: type mismatch in select, expected [i32, i32, i32] but got [i32, i32] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:362: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [] + error: type mismatch in select, expected [any, any, i32] but got [] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:371: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [i32] + error: type mismatch in select, expected [any, any, i32] but got [i32] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:380: assert_invalid passed: error: type mismatch in select, expected [i32, i32, i32] but got [i32, i32] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:389: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [] + error: type mismatch in select, expected [any, any, i32] but got [] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:398: assert_invalid passed: - error: type mismatch in select, expected [i32, any, any] but got [i32] + error: type mismatch in select, expected [any, any, i32] but got [i32] 0000020: error: OnSelectExpr callback failed out/test/spec/select.wast:407: assert_invalid passed: error: type mismatch in select, expected [i32, i32, i32] but got [i32, i32] diff --git a/test/typecheck/bad-select-cond.txt b/test/typecheck/bad-select-cond.txt index 899930e3..3e7755aa 100644 --- a/test/typecheck/bad-select-cond.txt +++ b/test/typecheck/bad-select-cond.txt @@ -1,13 +1,13 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (func (result i32) + (func (result i64) + i64.const 0 + i64.const 0 f32.const 0 - i32.const 0 - i32.const 0 select)) (;; STDERR ;;; -out/test/typecheck/bad-select-cond.txt:8:5: error: type mismatch in select, expected [i32, i32, i32] but got [f32, i32, i32] +out/test/typecheck/bad-select-cond.txt:8:5: error: type mismatch in select, expected [i64, i64, i32] but got [i64, i64, f32] select)) ^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-select-value0.txt b/test/typecheck/bad-select-value0.txt index dd13986d..b2833d03 100644 --- a/test/typecheck/bad-select-value0.txt +++ b/test/typecheck/bad-select-value0.txt @@ -8,7 +8,7 @@ select drop)) (;; STDERR ;;; -out/test/typecheck/bad-select-value0.txt:8:5: error: type mismatch in select, expected [i32, f64, f64] but got [i32, f64, f32] +out/test/typecheck/bad-select-value0.txt:8:5: error: type mismatch in select, expected [f64, f64, i32] but got [i32, f64, f32] select ^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-select-value1.txt b/test/typecheck/bad-select-value1.txt index 62db5ab5..7bb2447d 100644 --- a/test/typecheck/bad-select-value1.txt +++ b/test/typecheck/bad-select-value1.txt @@ -8,7 +8,7 @@ select drop)) (;; STDERR ;;; -out/test/typecheck/bad-select-value1.txt:8:5: error: type mismatch in select, expected [i32, i64, i64] but got [i32, i64, f32] +out/test/typecheck/bad-select-value1.txt:8:5: error: type mismatch in select, expected [i64, i64, i32] but got [i32, i64, f32] select ^^^^^^ ;;; STDERR ;;) |