1 files changed, 38 insertions, 64 deletions
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index 0af69c9fe..0d66c8822 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -574,18 +574,12 @@
        (br $do-once)
       )
      )
-     (set_local $1
-      (call $___fflush_unlocked
-       (get_local $0)
-      )
-     )
-     (set_local $2
-      (i32.eqz
-       (i32.const 0)
-      )
-     )
      (set_local $0
-      (get_local $1)
+      (tee_local $1
+       (call $___fflush_unlocked
+        (get_local $0)
+       )
+      )
      )
     )
     (block
@@ -612,16 +606,9 @@
        )
       )
       (loop $while-in
-       (set_local $2
-        (if (result i32)
-         (i32.gt_s
-          (i32.load offset=76
-           (get_local $1)
-          )
-          (i32.const -1)
-         )
-         (i32.const 0)
-         (i32.const 0)
+       (drop
+        (i32.load offset=76
+         (get_local $1)
         )
        )
        (if
@@ -1138,16 +1125,9 @@
     )
     (i32.const -1)
     (block (result i32)
-     (set_local $14
-      (if (result i32)
-       (i32.gt_s
-        (i32.load offset=76
-         (get_local $0)
-        )
-        (i32.const -1)
-       )
-       (i32.const 0)
-       (i32.const 0)
+     (drop
+      (i32.load offset=76
+       (get_local $0)
       )
      )
      (set_local $10
@@ -3685,43 +3665,40 @@
                          (get_local $26)
                         )
                        )
-                       (set_local $5
-                        (if (result i32)
-                         (i32.and
+                       (if
+                        (i32.and
+                         (get_local $11)
+                         (i32.const 8)
+                        )
+                        (block
+                         (set_local $7
                           (get_local $11)
-                          (i32.const 8)
                          )
-                         (block (result i32)
-                          (set_local $7
-                           (get_local $11)
-                          )
-                          (set_local $6
-                           (select
-                            (tee_local $11
-                             (i32.add
-                              (i32.sub
-                               (get_local $39)
-                               (get_local $8)
-                              )
-                              (i32.const 1)
+                         (set_local $6
+                          (select
+                           (tee_local $11
+                            (i32.add
+                             (i32.sub
+                              (get_local $39)
+                              (get_local $8)
                              )
+                             (i32.const 1)
                             )
+                           )
+                           (get_local $6)
+                           (i32.lt_s
                             (get_local $6)
-                            (i32.lt_s
-                             (get_local $6)
-                             (get_local $11)
-                            )
+                            (get_local $11)
                            )
                           )
-                          (get_local $8)
-                         )
-                         (block (result i32)
-                          (set_local $7
-                           (get_local $11)
-                          )
-                          (get_local $8)
                          )
                         )
+                        (set_local $7
+                         (get_local $11)
+                        )
+                       )
+                       (set_local $5
+                        (get_local $8)
                        )
                        (set_local $8
                         (i32.const 0)
@@ -4025,9 +4002,7 @@
                        (f64.mul
                         (call $_frexp
                          (get_local $15)
-                         (tee_local $5
-                          (get_local $20)
-                         )
+                         (get_local $20)
                         )
                         (f64.const 2)
                        )
@@ -6522,7 +6497,6 @@
                  )
                 )
                )
-               (br $__rjti$8)
               )
               (block
                (set_local $5
@@ -6534,9 +6508,9 @@
                (set_local $9
                 (i32.const 4091)
                )
-               (br $__rjti$8)
               )
              )
+             (br $__rjti$8)
             )
             (set_local $5
              (call $_fmt_u