Avoid new blocks in binary reading/writing (#1165)

* don't emit a toplevel block if we don't need to, as in wasm it is a list context

* don't create unnecessary blocks in wasm reading

1 files changed, 23 insertions, 37 deletions

diff --git a/test/polymorphic_stack.wast.fromBinary.noDebugInfo b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
index 3c0af4265..b521d43ed 100644
--- a/test/polymorphic_stack.wast.fromBinary.noDebugInfo
+++ b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
@@ -6,36 +6,30 @@
  (import "env" "table" (table 9 9 anyfunc))
  (memory $0 0)
  (func $0 (type $1) (result i32)
-  (block $label$0 (result i32)
+  (block $label$1 (result i32)
    (unreachable)
   )
  )
  (func $1 (type $0) (param $var$0 i32) (result i32)
-  (block $label$0 (result i32)
-   (unreachable)
-  )
+  (unreachable)
  )
  (func $2 (type $2) (param $var$0 i32)
   (local $var$1 f32)
-  (block $label$0
-   (unreachable)
-  )
+  (unreachable)
  )
  (func $3 (type $3)
   (local $var$0 f32)
   (if
    (i32.const 259)
-   (block $label$0
-    (unreachable)
-   )
+   (unreachable)
   )
  )
  (func $4 (type $3)
   (unreachable)
  )
  (func $5 (type $1) (result i32)
-  (block $label$0 (result i32)
-   (block $label$1
+  (block $label$1 (result i32)
+   (block $label$2
     (drop
      (i32.const 0)
     )
@@ -45,43 +39,35 @@
   )
  )
  (func $6 (type $0) (param $var$0 i32) (result i32)
-  (block $label$0 (result i32)
-   (if
-    (get_local $var$0)
-    (block $label$1
-     (return
-      (i32.const 127)
-     )
-    )
+  (if
+   (get_local $var$0)
+   (return
+    (i32.const 127)
    )
-   (block $label$2 (result i32)
-    (drop
-     (i32.const 0)
-    )
-    (return
-     (i32.const -32)
-    )
+  )
+  (block $label$2 (result i32)
+   (drop
+    (i32.const 0)
+   )
+   (return
+    (i32.const -32)
    )
   )
  )
  (func $7 (type $1) (result i32)
-  (block $label$0 (result i32)
-   (block $label$1 (result i32)
+  (block $label$1 (result i32)
+   (block $label$2 (result i32)
     (unreachable)
    )
   )
  )
  (func $8 (type $1) (result i32)
-  (block $label$0 (result i32)
-   (block $label$1
+  (block $label$1 (result i32)
+   (block $label$2
     (if
      (i32.const 0)
-     (block $label$2
-      (unreachable)
-     )
-     (block $label$3
-      (unreachable)
-     )
+     (unreachable)
+     (unreachable)
     )
    )
    (unreachable)