WastParser: tighten parsing of folded `if` (#2349)

This makes the `then` block mandatory per the spec, and parses
multiple foldedinstrs in the `if` predicate (exercised by the new
if.wast test).

1 files changed, 2 insertions, 30 deletions

diff --git a/test/regress/regress-23.txt b/test/regress/regress-23.txt
index e74c6c2b..8bcf11fa 100644
--- a/test/regress/regress-23.txt
+++ b/test/regress/regress-23.txt
@@ -4,17 +4,6 @@
 ;; This regression test makes sure that the end_loc of `if` blocks is properly
 ;; set when using the folded format.
 
-;; if/else shorthand format, error in true branch.
-(func (result i32)
-  (if (result i32)
-    (i32.const 0)
-    (block
-      (unreachable)
-    )
-    (i32.const 0)
-  )
-)
-
 ;; if/else with `then`/`else` keywords, error in true branch.
 (func (result i32)
   (if (result i32)
@@ -30,17 +19,6 @@
   )
 )
 
-;; if/else shorthand format, error in false branch.
-(func (result i32)
-  (if (result i32)
-    (i32.const 0)
-    (i32.const 0)
-    (block
-      (unreachable)
-    )
-  )
-)
-
 ;; if/else with `then`/`else` keywords, error in false branch.
 (func (result i32)
   (if (result i32)
@@ -56,16 +34,10 @@
   )
 )
 (;; STDERR ;;;
-out/test/regress/regress-23.txt:13:5: error: type mismatch in `if true` branch, expected [i32] but got []
-    )
-    ^
-out/test/regress/regress-23.txt:25:7: error: type mismatch in `if true` branch, expected [i32] but got []
+out/test/regress/regress-23.txt:14:7: error: type mismatch in `if true` branch, expected [i32] but got []
       )
       ^
-out/test/regress/regress-23.txt:41:3: error: type mismatch in `if false` branch, expected [i32] but got []
-  )
-  ^
-out/test/regress/regress-23.txt:56:3: error: type mismatch in `if false` branch, expected [i32] but got []
+out/test/regress/regress-23.txt:34:3: error: type mismatch in `if false` branch, expected [i32] but got []
   )
   ^
 ;;; STDERR ;;)