Merge pull request #540 from WebAssembly/merge-blocks

Merge blocks improvements

1 files changed, 84 insertions, 98 deletions

diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
index fac02cca9..0b7f2497b 100644
--- a/test/emcc_hello_world.fromasm.imprecise
+++ b/test/emcc_hello_world.fromasm.imprecise
@@ -19089,16 +19089,14 @@
                 )
               )
             )
+            (i32.store
+              (i32.const 168)
+              (i32.const 0)
+            )
             (return
-              (block
-                (i32.store
-                  (i32.const 168)
-                  (i32.const 0)
-                )
-                (i32.div_u
-                  (get_local $7)
-                  (get_local $5)
-                )
+              (i32.div_u
+                (get_local $7)
+                (get_local $5)
               )
             )
           )
@@ -19107,12 +19105,12 @@
               (i32.eqz
                 (get_local $2)
               )
-              (return
-                (block
-                  (i32.store
-                    (i32.const 168)
-                    (i32.const 0)
-                  )
+              (block
+                (i32.store
+                  (i32.const 168)
+                  (i32.const 0)
+                )
+                (return
                   (i32.const 0)
                 )
               )
@@ -19131,14 +19129,12 @@
                 (i32.const 0)
               )
             )
+            (i32.store
+              (i32.const 168)
+              (i32.const 0)
+            )
             (return
-              (block
-                (i32.store
-                  (i32.const 168)
-                  (i32.const 0)
-                )
-                (i32.const 0)
-              )
+              (i32.const 0)
             )
           )
         )
@@ -19179,16 +19175,14 @@
                   )
                 )
               )
+              (i32.store
+                (i32.const 168)
+                (i32.const 0)
+              )
               (return
-                (block
-                  (i32.store
-                    (i32.const 168)
-                    (i32.const 0)
-                  )
-                  (i32.div_u
-                    (get_local $6)
-                    (get_local $5)
-                  )
+                (i32.div_u
+                  (get_local $6)
+                  (get_local $5)
                 )
               )
             )
@@ -19218,16 +19212,14 @@
                   )
                 )
               )
+              (i32.store
+                (i32.const 168)
+                (i32.const 0)
+              )
               (return
-                (block
-                  (i32.store
-                    (i32.const 168)
-                    (i32.const 0)
-                  )
-                  (i32.div_u
-                    (get_local $6)
-                    (get_local $8)
-                  )
+                (i32.div_u
+                  (get_local $6)
+                  (get_local $8)
                 )
               )
             )
@@ -19277,17 +19269,15 @@
                   )
                 )
               )
+              (i32.store
+                (i32.const 168)
+                (i32.const 0)
+              )
               (return
-                (block
-                  (i32.store
-                    (i32.const 168)
-                    (i32.const 0)
-                  )
-                  (i32.shr_u
-                    (get_local $6)
-                    (i32.ctz
-                      (get_local $8)
-                    )
+                (i32.shr_u
+                  (get_local $6)
+                  (i32.ctz
+                    (get_local $8)
                   )
                 )
               )
@@ -19356,12 +19346,12 @@
               (get_local $4)
               (i32.const 0)
             )
-            (return
-              (block
-                (i32.store
-                  (i32.const 168)
-                  (i32.const 0)
-                )
+            (block
+              (i32.store
+                (i32.const 168)
+                (i32.const 0)
+              )
+              (return
                 (i32.const 0)
               )
             )
@@ -19386,14 +19376,12 @@
               )
             )
           )
+          (i32.store
+            (i32.const 168)
+            (i32.const 0)
+          )
           (return
-            (block
-              (i32.store
-                (i32.const 168)
-                (i32.const 0)
-              )
-              (i32.const 0)
-            )
+            (i32.const 0)
           )
         )
         (block
@@ -19479,12 +19467,12 @@
                   (get_local $4)
                   (i32.const 0)
                 )
-                (return
-                  (block
-                    (i32.store
-                      (i32.const 168)
-                      (i32.const 0)
-                    )
+                (block
+                  (i32.store
+                    (i32.const 168)
+                    (i32.const 0)
+                  )
+                  (return
                     (i32.const 0)
                   )
                 )
@@ -19509,14 +19497,12 @@
                   )
                 )
               )
+              (i32.store
+                (i32.const 168)
+                (i32.const 0)
+              )
               (return
-                (block
-                  (i32.store
-                    (i32.const 168)
-                    (i32.const 0)
-                  )
-                  (i32.const 0)
-                )
+                (i32.const 0)
               )
             )
           )
@@ -19682,18 +19668,18 @@
               (get_local $5)
               (i32.const 1)
             )
-            (return
-              (block
-                (i32.store
-                  (i32.const 168)
-                  (i32.or
-                    (get_local $9)
-                    (i32.and
-                      (get_local $1)
-                      (i32.const 0)
-                    )
+            (block
+              (i32.store
+                (i32.const 168)
+                (i32.or
+                  (get_local $9)
+                  (i32.and
+                    (get_local $1)
+                    (i32.const 0)
                   )
                 )
+              )
+              (return
                 (i32.or
                   (i32.const 0)
                   (i32.and
@@ -19703,22 +19689,22 @@
                 )
               )
             )
-            (return
-              (block
-                (i32.store
-                  (i32.const 168)
-                  (i32.or
-                    (i32.const 0)
-                    (i32.shr_u
-                      (get_local $6)
-                      (set_local $0
-                        (i32.ctz
-                          (get_local $5)
-                        )
+            (block
+              (i32.store
+                (i32.const 168)
+                (i32.or
+                  (i32.const 0)
+                  (i32.shr_u
+                    (get_local $6)
+                    (set_local $0
+                      (i32.ctz
+                        (get_local $5)
                       )
                     )
                   )
                 )
+              )
+              (return
                 (i32.or
                   (i32.shl
                     (get_local $6)