2 files changed, 48 insertions, 16 deletions
diff --git a/test/emcc_O2_hello_world.wast b/test/emcc_O2_hello_world.wast
index 1b3ff0336..777bcc9d0 100644
--- a/test/emcc_O2_hello_world.wast
+++ b/test/emcc_O2_hello_world.wast
@@ -4654,11 +4654,13 @@
                         )
                       )
                     )
-                    (break $do-in$29
+                    (if
                       (i32.ne
                         (get_local $i63)
                         (i32.const 0)
                       )
+                      (break $do-in$29
+                      )
                     )
                   )
                 )
@@ -6677,7 +6679,7 @@
                       (get_local $i63)
                       (i32.const 7)
                     )
-                    (break $do-in$47
+                    (if
                       (i32.lt_u
                         (i32.shr_u
                           (i32.add
@@ -6691,6 +6693,8 @@
                           (i32.const 0)
                         )
                       )
+                      (break $do-in$47
+                      )
                     )
                   )
                 )
@@ -7379,11 +7383,13 @@
                         (i32.const 1)
                       )
                     )
-                    (break $do-in$51
+                    (if
                       (i32.ne
                         (get_local $i5)
                         (i32.const 32)
                       )
+                      (break $do-in$51
+                      )
                     )
                   )
                 )
@@ -11450,11 +11456,13 @@
         (block
           (loop $while-out$0 $while-in$1
             (block
-              (break $while-in$1
+              (if
                 (i32.and
                   (get_local $i1)
                   (i32.const 3)
                 )
+                (break $while-in$1
+                )
               )
               (block
                 (if
@@ -11495,11 +11503,13 @@
           )
           (loop $while-out$2 $while-in$3
             (block
-              (break $while-in$3
+              (if
                 (i32.ge_s
                   (get_local $i3)
                   (i32.const 4)
                 )
+                (break $while-in$3
+                )
               )
               (block
                 (i32.store align=4
@@ -11533,11 +11543,13 @@
       )
       (loop $while-out$4 $while-in$5
         (block
-          (break $while-in$5
+          (if
             (i32.gt_s
               (get_local $i3)
               (i32.const 0)
             )
+            (break $while-in$5
+            )
           )
           (block
             (i32.store8 align=1
@@ -11649,11 +11661,13 @@
               )
               (loop $while-out$0 $while-in$1
                 (block
-                  (break $while-in$1
+                  (if
                     (i32.lt_s
                       (get_local $i1)
                       (get_local $i5)
                     )
+                    (break $while-in$1
+                    )
                   )
                   (block
                     (i32.store8 align=1
@@ -11673,11 +11687,13 @@
           )
           (loop $while-out$2 $while-in$3
             (block
-              (break $while-in$3
+              (if
                 (i32.lt_s
                   (get_local $i1)
                   (get_local $i7)
                 )
+                (break $while-in$3
+                )
               )
               (block
                 (i32.store align=4
@@ -11697,11 +11713,13 @@
       )
       (loop $while-out$4 $while-in$5
         (block
-          (break $while-in$5
+          (if
             (i32.lt_s
               (get_local $i1)
               (get_local $i4)
             )
+            (break $while-in$5
+            )
           )
           (block
             (i32.store8 align=1
diff --git a/test/emcc_hello_world.wast b/test/emcc_hello_world.wast
index 21394f768..7941533c6 100644
--- a/test/emcc_hello_world.wast
+++ b/test/emcc_hello_world.wast
@@ -2300,11 +2300,13 @@
               (i32.const 4)
             )
           )
-          (break $do-in$1
+          (if
             (i32.lt_s
               (get_local $dest)
               (get_local $stop)
             )
+            (break $do-in$1
+            )
           )
         )
       )
@@ -24869,11 +24871,13 @@
               )
               (loop $while-out$0 $while-in$1
                 (block
-                  (break $while-in$1
+                  (if
                     (i32.lt_s
                       (get_local $ptr)
                       (get_local $unaligned)
                     )
+                    (break $while-in$1
+                    )
                   )
                   (block
                     (i32.store8 align=1
@@ -24893,11 +24897,13 @@
           )
           (loop $while-out$2 $while-in$3
             (block
-              (break $while-in$3
+              (if
                 (i32.lt_s
                   (get_local $ptr)
                   (get_local $stop4)
                 )
+                (break $while-in$3
+                )
               )
               (block
                 (i32.store align=4
@@ -24917,11 +24923,13 @@
       )
       (loop $while-out$4 $while-in$5
         (block
-          (break $while-in$5
+          (if
             (i32.lt_s
               (get_local $ptr)
               (get_local $stop)
             )
+            (break $while-in$5
+            )
           )
           (block
             (i32.store8 align=1
@@ -25100,11 +25108,13 @@
         (block
           (loop $while-out$0 $while-in$1
             (block
-              (break $while-in$1
+              (if
                 (i32.and
                   (get_local $dest)
                   (i32.const 3)
                 )
+                (break $while-in$1
+                )
               )
               (block
                 (if
@@ -25145,11 +25155,13 @@
           )
           (loop $while-out$2 $while-in$3
             (block
-              (break $while-in$3
+              (if
                 (i32.ge_s
                   (get_local $num)
                   (i32.const 4)
                 )
+                (break $while-in$3
+                )
               )
               (block
                 (i32.store align=4
@@ -25183,11 +25195,13 @@
       )
       (loop $while-out$4 $while-in$5
         (block
-          (break $while-in$5
+          (if
             (i32.gt_s
               (get_local $num)
               (i32.const 0)
             )
+            (break $while-in$5
+            )
           )
           (block
             (i32.store8 align=1