1 files changed, 41 insertions, 59 deletions
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index 94eb84af9..bb4696f9f 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -1424,6 +1424,7 @@
           )
           (set_local $2
             (select
+              (i32.const -1)
               (if
                 (i32.load
                   (tee_local $10
@@ -1519,12 +1520,10 @@
                       )
                       (set_local $1
                         (select
-                          (i32.const -1)
                           (get_local $1)
-                          (i32.eqz
-                            (i32.load
-                              (get_local $11)
-                            )
+                          (i32.const -1)
+                          (i32.load
+                            (get_local $11)
                           )
                         )
                       )
@@ -1554,16 +1553,13 @@
                   )
                 )
               )
-              (i32.const -1)
-              (i32.eqz
-                (i32.and
-                  (tee_local $1
-                    (i32.load
-                      (get_local $0)
-                    )
+              (i32.and
+                (tee_local $1
+                  (i32.load
+                    (get_local $0)
                   )
-                  (i32.const 32)
                 )
+                (i32.const 32)
               )
             )
           )
@@ -4029,18 +4025,16 @@
         )
         (set_local $18
           (select
-            (get_local $8)
             (tee_local $7
               (i32.and
                 (get_local $8)
                 (i32.const -65537)
               )
             )
-            (i32.eqz
-              (i32.and
-                (get_local $8)
-                (i32.const 8192)
-              )
+            (get_local $8)
+            (i32.and
+              (get_local $8)
+              (i32.const 8192)
             )
           )
         )
@@ -4504,14 +4498,12 @@
                               (block
                                 (set_local $1
                                   (select
-                                    (i32.const 4091)
                                     (i32.const 4093)
-                                    (i32.eqz
-                                      (tee_local $6
-                                        (i32.and
-                                          (get_local $18)
-                                          (i32.const 1)
-                                        )
+                                    (i32.const 4091)
+                                    (tee_local $6
+                                      (i32.and
+                                        (get_local $18)
+                                        (i32.const 1)
                                       )
                                     )
                                   )
@@ -4720,14 +4712,12 @@
                   (block
                     (set_local $39
                       (select
-                        (i32.const 4109)
                         (i32.const 4114)
-                        (i32.eqz
-                          (tee_local $1
-                            (i32.and
-                              (get_local $18)
-                              (i32.const 1)
-                            )
+                        (i32.const 4109)
+                        (tee_local $1
+                          (i32.and
+                            (get_local $18)
+                            (i32.const 1)
                           )
                         )
                       )
@@ -4806,17 +4796,15 @@
                       (block
                         (set_local $9
                           (select
-                            (get_local $39)
                             (i32.add
                               (get_local $39)
                               (i32.const 9)
                             )
-                            (i32.eqz
-                              (tee_local $6
-                                (i32.and
-                                  (get_local $26)
-                                  (i32.const 32)
-                                )
+                            (get_local $39)
+                            (tee_local $6
+                              (i32.and
+                                (get_local $26)
+                                (i32.const 32)
                               )
                             )
                           )
@@ -5635,15 +5623,13 @@
                                     )
                                     (set_local $5
                                       (select
+                                        (get_local $7)
                                         (i32.add
                                           (get_local $7)
                                           (i32.const 4)
                                         )
-                                        (get_local $7)
-                                        (i32.eqz
-                                          (i32.load
-                                            (get_local $7)
-                                          )
+                                        (i32.load
+                                          (get_local $7)
                                         )
                                       )
                                     )
@@ -5666,15 +5652,13 @@
                                     (get_local $5)
                                   )
                                   (select
+                                    (get_local $7)
                                     (i32.add
                                       (get_local $7)
                                       (i32.const 4)
                                     )
-                                    (get_local $7)
-                                    (i32.eqz
-                                      (i32.load
-                                        (get_local $7)
-                                      )
+                                    (i32.load
+                                      (get_local $7)
                                     )
                                   )
                                 )
@@ -5990,19 +5974,17 @@
                               (block
                                 (set_local $14
                                   (select
-                                    (f64.const 9007199254740992)
                                     (f64.const 9007199254740994)
-                                    (i32.eqz
+                                    (f64.const 9007199254740992)
+                                    (i32.and
                                       (i32.and
-                                        (i32.and
-                                          (call_import $i32u-div
-                                            (get_local $5)
-                                            (get_local $17)
-                                          )
-                                          (i32.const -1)
+                                        (call_import $i32u-div
+                                          (get_local $5)
+                                          (get_local $17)
                                         )
-                                        (i32.const 1)
+                                        (i32.const -1)
                                       )
+                                      (i32.const 1)
                                     )
                                   )
                                 )