1 files changed, 84 insertions, 98 deletions
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index 6f6da8ed3..d5e961a92 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -19091,16 +19091,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)
               )
             )
           )
@@ -19109,12 +19107,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)
                 )
               )
@@ -19133,14 +19131,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)
             )
           )
         )
@@ -19181,16 +19177,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)
                 )
               )
             )
@@ -19220,16 +19214,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)
                 )
               )
             )
@@ -19279,17 +19271,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)
                   )
                 )
               )
@@ -19358,12 +19348,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)
               )
             )
@@ -19388,14 +19378,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
@@ -19481,12 +19469,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)
                   )
                 )
@@ -19511,14 +19499,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)
               )
             )
           )
@@ -19684,18 +19670,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
@@ -19705,22 +19691,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)