Don't try to optimize away unused names in RemoveUnusedBrs (#1750)

Rely on the dedicated pass for that. It's not worth the extra complexity to try, as we can't easily handle all the cases anyhow.

Add another run of the dedicated name-removing pass in the default passes.

1 files changed, 21 insertions, 24 deletions

diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index 9ca992073..7c581ba3e 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -178,15 +178,14 @@
     (i32.const 51)
    )
   )
-  (block $switch-case9
-   (block $switch-case4
-    (br_table $switch-case4 $switch-case9 $switch-case9 $switch-case9 $switch-case9 $switch-case4 $switch-case9 $switch-case4 $switch-case9
-     (i32.add
-      (get_local $0)
-      (i32.const -5)
-     )
+  (block $switch-case4
+   (drop
+    (i32.add
+     (get_local $0)
+     (i32.const -5)
     )
    )
+   (br $switch-case4)
   )
   (loop $label$continue$L1
    (block $label$break$L1
@@ -974,27 +973,25 @@
  )
  (func $relooperJumpThreading__ZN4game14preloadweaponsEv (; 44 ;) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32)
   (loop $while-in
-   (block $__rjto$1
-    (block $__rjti$1
-     (if
-      (get_local $1)
-      (br_if $__rjti$1
-       (i32.eqz
-        (get_local $2)
-       )
+   (block $__rjti$1
+    (if
+     (get_local $1)
+     (br_if $__rjti$1
+      (i32.eqz
+       (get_local $2)
       )
-      (br_if $__rjti$1
-       (i32.eqz
-        (get_local $3)
-       )
+     )
+     (br_if $__rjti$1
+      (i32.eqz
+       (get_local $3)
       )
      )
-     (br $while-in)
-    )
-    (i32.store
-     (get_local $4)
-     (get_local $5)
     )
+    (br $while-in)
+   )
+   (i32.store
+    (get_local $4)
+    (get_local $5)
    )
    (br $while-in)
   )