allow values to flow out of loops in RemoveUnneededBrs, and simplify some unnecessary complexity in that pass as well

1 files changed, 15 insertions, 22 deletions

diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index b0f46e7ad..bf01a4681 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -179,15 +179,11 @@
    )
   )
   (block $switch-case9
-   (block $switch-case6
-    (block $switch-case5
-     (block $switch-case4
-      (br_table $switch-case9 $switch-case9 $switch-case9 $switch-case6 $switch-case9 $switch-case9 $switch-case9 $switch-case9 $switch-case5 $switch-case9 $switch-case4 $switch-case9
-       (i32.sub
-        (get_local $0)
-        (i32.const 2)
-       )
-      )
+   (block $switch-case4
+    (br_table $switch-case9 $switch-case9 $switch-case9 $switch-case4 $switch-case9 $switch-case9 $switch-case9 $switch-case9 $switch-case4 $switch-case9 $switch-case4 $switch-case9
+     (i32.sub
+      (get_local $0)
+      (i32.const 2)
      )
     )
    )
@@ -801,22 +797,19 @@
   (call $h
    (i32.const -1)
   )
-  (block $__rjti$1
-   (loop $while-in
-    (br_if $while-in
-     (i32.eqz
-      (tee_local $0
-       (i32.add
-        (get_local $0)
-        (i32.const 1)
-       )
+  (loop $while-in
+   (br_if $while-in
+    (i32.eqz
+     (tee_local $0
+      (i32.add
+       (get_local $0)
+       (i32.const 1)
       )
      )
     )
-    (call $h
-     (i32.const 2)
-    )
-    (br $__rjti$1)
+   )
+   (call $h
+    (i32.const 2)
    )
   )
   (call $h