Update Binaryen to 98.0.0-nightly.20201030 / update pass pipeline (#1526)

Author: MaxGraey

package-lock.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "98.0.0-nightly.20201027",
+    "binaryen": "98.0.0-nightly.20201030",
     "long": "^4.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^6.2.0"

package.json

@@ -1530,12 +1530,13 @@ export class Module {
       }
       if (optimizeLevel >= 3) {
         passes.push("flatten");
+        passes.push("vacuum");
         passes.push("simplify-locals-notee-nostructure");
         passes.push("merge-locals");
-        passes.push("vacuum");
 
         passes.push("code-folding");
         passes.push("flatten");
+        passes.push("vacuum");
         passes.push("local-cse");
         passes.push("reorder-locals");
       }
@@ -1550,8 +1551,8 @@ export class Module {
       if (optimizeLevel >= 3 || shrinkLevel >= 1) {
         passes.push("dce");
       }
-      passes.push("remove-unused-brs");
       passes.push("remove-unused-names");
+      passes.push("remove-unused-brs");
       if (optimizeLevel >= 3 || shrinkLevel >= 2) {
         passes.push("inlining");
         passes.push("precompute-propagate");

src/module.ts

@@ -2074,10 +2074,45 @@
    unreachable
   end
  )
- (func $~lib/array/Array<extends-baseaggregate/B1>#__visit_impl (param $0 i32) (param $1 i32)
+ (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
+  block $folding-inner0
+   block $switch$1$default
+    block $switch$1$case$6
+     block $switch$1$case$4
+      block $switch$1$case$2
+       local.get $0
+       i32.const 8
+       i32.sub
+       i32.load
+       br_table $switch$1$case$2 $switch$1$case$2 $switch$1$case$4 $switch$1$case$4 $switch$1$case$6 $switch$1$case$4 $switch$1$case$6 $folding-inner0 $folding-inner0 $switch$1$default
+      end
+      return
+     end
+     local.get $0
+     i32.load
+     local.tee $0
+     if
+      local.get $0
+      local.get $1
+      call $~lib/rt/pure/__visit
+     end
+     return
+    end
+    local.get $0
+    i32.load offset=16
+    local.tee $0
+    if
+     local.get $0
+     local.get $1
+     call $~lib/rt/pure/__visit
+    end
+    return
+   end
+   unreachable
+  end
   local.get $0
   i32.load offset=4
   local.tee $2
@@ -2112,51 +2147,4 @@
   local.get $1
   call $~lib/rt/pure/__visit
  )
- (func $~lib/rt/__visit_members (param $0 i32) (param $1 i32)
-  block $switch$1$default
-   block $switch$1$case$10
-    block $switch$1$case$9
-     block $switch$1$case$6
-      block $switch$1$case$4
-       block $switch$1$case$2
-        local.get $0
-        i32.const 8
-        i32.sub
-        i32.load
-        br_table $switch$1$case$2 $switch$1$case$2 $switch$1$case$4 $switch$1$case$4 $switch$1$case$6 $switch$1$case$4 $switch$1$case$6 $switch$1$case$9 $switch$1$case$10 $switch$1$default
-       end
-       return
-      end
-      local.get $0
-      i32.load
-      local.tee $0
-      if
-       local.get $0
-       local.get $1
-       call $~lib/rt/pure/__visit
-      end
-      return
-     end
-     local.get $0
-     i32.load offset=16
-     local.tee $0
-     if
-      local.get $0
-      local.get $1
-      call $~lib/rt/pure/__visit
-     end
-     return
-    end
-    local.get $0
-    local.get $1
-    call $~lib/array/Array<extends-baseaggregate/B1>#__visit_impl
-    return
-   end
-   local.get $0
-   local.get $1
-   call $~lib/array/Array<extends-baseaggregate/B1>#__visit_impl
-   return
-  end
-  unreachable
- )
 )