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, 45 insertions, 47 deletions

diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index c243b2c8e..8b07f24c0 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -170,70 +170,68 @@
   )
   (block $switch
    (block $switch-default
-    (block $switch-case0
-     (if
-      (tee_local $5
-       (tee_local $3
-        (i32.and
-         (tee_local $3
-          (call $_bitshift64Lshr
-           (tee_local $2
-            (i32.load
-             (get_global $tempDoublePtr)
-            )
+    (if
+     (tee_local $5
+      (tee_local $3
+       (i32.and
+        (tee_local $3
+         (call $_bitshift64Lshr
+          (tee_local $2
+           (i32.load
+            (get_global $tempDoublePtr)
            )
-           (tee_local $4
-            (i32.load offset=4
-             (get_global $tempDoublePtr)
-            )
+          )
+          (tee_local $4
+           (i32.load offset=4
+            (get_global $tempDoublePtr)
            )
-           (i32.const 52)
           )
+          (i32.const 52)
          )
-         (i32.const 2047)
         )
-       )
-      )
-      (if
-       (i32.eq
-        (get_local $5)
         (i32.const 2047)
        )
-       (br $switch)
-       (br $switch-default)
       )
      )
-     (i32.store
-      (get_local $1)
-      (tee_local $2
-       (if (result i32)
-        (f64.ne
-         (get_local $0)
-         (f64.const 0)
-        )
-        (block (result i32)
-         (set_local $0
-          (call $_frexp
-           (f64.mul
-            (get_local $0)
-            (f64.const 18446744073709551615)
-           )
-           (get_local $1)
+     (if
+      (i32.eq
+       (get_local $5)
+       (i32.const 2047)
+      )
+      (br $switch)
+      (br $switch-default)
+     )
+    )
+    (i32.store
+     (get_local $1)
+     (tee_local $2
+      (if (result i32)
+       (f64.ne
+        (get_local $0)
+        (f64.const 0)
+       )
+       (block (result i32)
+        (set_local $0
+         (call $_frexp
+          (f64.mul
+           (get_local $0)
+           (f64.const 18446744073709551615)
           )
+          (get_local $1)
          )
-         (i32.add
-          (i32.load
-           (get_local $1)
-          )
-          (i32.const -64)
+        )
+        (i32.add
+         (i32.load
+          (get_local $1)
          )
+         (i32.const -64)
         )
-        (i32.const 0)
        )
+       (i32.const 0)
       )
      )
-     (br $switch)
     )
+    (br $switch)
    )
    (i32.store
     (get_local $1)