Merge pull request #583 from WebAssembly/br-more

Fix and improve br optimizations

1 files changed, 24 insertions, 30 deletions

diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
index 29492cd2c..b7e3d5f59 100644
--- a/test/emcc_hello_world.fromasm.imprecise
+++ b/test/emcc_hello_world.fromasm.imprecise
@@ -1413,11 +1413,7 @@
             )
           )
           (set_local $14
-            (if
-              (i32.eq
-                (get_local $16)
-                (i32.const 2)
-              )
+            (select
               (i32.const 0)
               (i32.sub
                 (get_local $2)
@@ -1425,6 +1421,10 @@
                   (get_local $15)
                 )
               )
+              (i32.eq
+                (get_local $16)
+                (i32.const 2)
+              )
             )
           )
         )
@@ -5420,19 +5420,7 @@
                                   )
                                   (br $while-in$61)
                                 )
-                                (if
-                                  (i32.eq
-                                    (i32.shr_s
-                                      (i32.shl
-                                        (i32.load8_s
-                                          (get_local $11)
-                                        )
-                                        (i32.const 24)
-                                      )
-                                      (i32.const 24)
-                                    )
-                                    (i32.const 45)
-                                  )
+                                (select
                                   (f64.neg
                                     (f64.add
                                       (get_local $29)
@@ -5451,6 +5439,18 @@
                                     )
                                     (get_local $29)
                                   )
+                                  (i32.eq
+                                    (i32.shr_s
+                                      (i32.shl
+                                        (i32.load8_s
+                                          (get_local $11)
+                                        )
+                                        (i32.const 24)
+                                      )
+                                      (i32.const 24)
+                                    )
+                                    (i32.const 45)
+                                  )
                                 )
                               )
                             )
@@ -5609,7 +5609,8 @@
                                     (i32.const 1)
                                   )
                                   (block
-                                    (if
+                                    (br_if $do-once$64
+                                      (get_local $1)
                                       (i32.and
                                         (get_local $13)
                                         (i32.and
@@ -5620,9 +5621,6 @@
                                           )
                                         )
                                       )
-                                      (br $do-once$64
-                                        (get_local $1)
-                                      )
                                     )
                                     (i32.store8
                                       (get_local $1)
@@ -5997,14 +5995,12 @@
                                       )
                                       (br $while-in$73)
                                     )
-                                    (if
+                                    (br_if $do-once$70
+                                      (get_local $8)
                                       (i32.eq
                                         (get_local $5)
                                         (i32.const 0)
                                       )
-                                      (br $do-once$70
-                                        (get_local $8)
-                                      )
                                     )
                                     (i32.store
                                       (set_local $6
@@ -14939,14 +14935,12 @@
                                       )
                                       (i32.const 0)
                                       (block
-                                        (if
+                                        (br_if $do-once$69
+                                          (i32.const 31)
                                           (i32.gt_u
                                             (get_local $4)
                                             (i32.const 16777215)
                                           )
-                                          (br $do-once$69
-                                            (i32.const 31)
-                                          )
                                         )
                                         (set_local $1
                                           (i32.shl