Support new result syntax for if/loop/block (#1047)

Support both syntax formats in input since the old spec
tests still need to be parsable.

1 files changed, 24 insertions, 24 deletions

diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt
index 4d3ddc0b6..c1db051ad 100644
--- a/test/passes/print-call-graph.txt
+++ b/test/passes/print-call-graph.txt
@@ -396,7 +396,7 @@ digraph call {
    )
   )
   (set_local $0
-   (block $jumpthreading$outer$1 i32
+   (block $jumpthreading$outer$1 (result i32)
     (block $jumpthreading$inner$1
      (block $jumpthreading$inner$0
       (loop $while-in
@@ -404,11 +404,11 @@ digraph call {
         (i32.eq
          (get_local $11)
          (tee_local $4
-          (if i32
+          (if (result i32)
            (i32.load
             (i32.const 1140)
            )
-           (block $block i32
+           (block $block (result i32)
             (call $_pthread_cleanup_push
              (i32.const 1)
              (get_local $0)
@@ -440,7 +440,7 @@ digraph call {
             )
             (get_local $3)
            )
-           (block $block0 i32
+           (block $block0 (result i32)
             (i32.store
              (get_local $8)
              (i32.load
@@ -479,7 +479,7 @@ digraph call {
         )
        )
        (set_local $1
-        (if i32
+        (if (result i32)
          (i32.gt_u
           (get_local $4)
           (tee_local $12
@@ -488,7 +488,7 @@ digraph call {
            )
           )
          )
-         (block $block2 i32
+         (block $block2 (result i32)
           (i32.store
            (get_local $6)
            (tee_local $3
@@ -523,12 +523,12 @@ digraph call {
            (get_local $1)
           )
          )
-         (if i32
+         (if (result i32)
           (i32.eq
            (get_local $5)
            (i32.const 2)
           )
-          (block $block4 i32
+          (block $block4 (result i32)
            (i32.store
             (get_local $6)
             (i32.add
@@ -546,7 +546,7 @@ digraph call {
            )
            (get_local $12)
           )
-          (block $block5 i32
+          (block $block5 (result i32)
            (set_local $3
             (get_local $1)
            )
@@ -687,7 +687,7 @@ digraph call {
    (get_local $2)
   )
   (set_local $0
-   (if i32
+   (if (result i32)
     (i32.lt_s
      (call $___syscall_ret
       (call $___syscall140
@@ -697,7 +697,7 @@ digraph call {
      )
      (i32.const 0)
     )
-    (block $block i32
+    (block $block (result i32)
      (i32.store
       (get_local $0)
       (i32.const -1)
@@ -715,12 +715,12 @@ digraph call {
   (get_local $0)
  )
  (func $___syscall_ret (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  (if i32
+  (if (result i32)
    (i32.gt_u
     (get_local $0)
     (i32.const -4096)
    )
-   (block $block i32
+   (block $block (result i32)
     (i32.store
      (call $___errno_location)
      (i32.sub
@@ -734,7 +734,7 @@ digraph call {
   )
  )
  (func $___errno_location (type $6) (result i32)
-  (if i32
+  (if (result i32)
    (i32.load
     (i32.const 1140)
    )
@@ -833,10 +833,10 @@ digraph call {
  (func $_fflush (type $FUNCSIG$ii) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
-  (block $do-once i32
-   (if i32
+  (block $do-once (result i32)
+   (if (result i32)
     (get_local $0)
-    (block $block i32
+    (block $block (result i32)
      (if
       (i32.le_s
        (i32.load offset=76
@@ -862,10 +862,10 @@ digraph call {
        (get_local $0)
       )
      )
-     (if i32
+     (if (result i32)
       (get_local $2)
       (get_local $1)
-      (block $block9 i32
+      (block $block9 (result i32)
        (call $_free
         (get_local $0)
        )
@@ -873,9 +873,9 @@ digraph call {
       )
      )
     )
-    (block $block10 i32
+    (block $block10 (result i32)
      (set_local $0
-      (if i32
+      (if (result i32)
        (i32.load
         (i32.const 1136)
        )
@@ -898,7 +898,7 @@ digraph call {
       )
       (loop $while-in
        (set_local $2
-        (if i32
+        (if (result i32)
          (i32.gt_s
           (i32.load offset=76
            (get_local $1)
@@ -912,7 +912,7 @@ digraph call {
         )
        )
        (set_local $0
-        (if i32
+        (if (result i32)
          (i32.gt_u
           (i32.load offset=20
            (get_local $1)
@@ -960,7 +960,7 @@ digraph call {
   (local $4 i32)
   (local $5 i32)
   (local $6 i32)
-  (block $jumpthreading$outer$0 i32
+  (block $jumpthreading$outer$0 (result i32)
    (block $jumpthreading$inner$0
     (br_if $jumpthreading$inner$0
      (i32.le_u