reorder locals in wasm2asm (#1482)

The documentation for the simplify-locals pass suggests running
reorder-locals after it to clean up unnecessary locals.  wasm2asm wasn't
doing this, which meant that generated code had a number of unused
variables.  A good minimizer will probably clean that up, but let's go
ahead and clean it up in wasm2asm itself.

1 files changed, 14 insertions, 21 deletions

diff --git a/test/unary-ops.2asm.js b/test/unary-ops.2asm.js
index 6c3ffd2ba..b8d6666b3 100644
--- a/test/unary-ops.2asm.js
+++ b/test/unary-ops.2asm.js
@@ -21,7 +21,6 @@ function asmFunc(global, env, buffer) {
  
  function $1($0) {
   $0 = $0 | 0;
-  var $1 = 0, $2 = 0;
   return __wasm_popcnt_i32($0) | 0 | 0;
  }
  
@@ -30,7 +29,7 @@ function asmFunc(global, env, buffer) {
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $0;
   i64toi32_i32$1 = (__wasm_popcnt_i32(i64toi32_i32$0) | 0) + (__wasm_popcnt_i32(i64toi32_i32$1) | 0) | 0;
@@ -42,7 +41,6 @@ function asmFunc(global, env, buffer) {
   $0 = $0 | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0;
   return ($0 | 0) == (r | 0) & (0 | 0) == (r$hi | 0) | 0 | 0;
  }
  
@@ -50,7 +48,7 @@ function asmFunc(global, env, buffer) {
   $0 = $0 | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$1 = $0;
   i64toi32_i32$0 = i64toi32_i32$1 >> 31 | 0;
   i64toi32_i32$2 = i64toi32_i32$1;
@@ -61,19 +59,16 @@ function asmFunc(global, env, buffer) {
  function $5($0, $0$hi) {
   $0 = $0 | 0;
   $0$hi = $0$hi | 0;
-  var i64toi32_i32$0 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0;
   return ($0 | $0$hi | 0 | 0) == (0 | 0) | 0;
  }
  
  function $6($0) {
   $0 = $0 | 0;
-  var $1 = 0, $2 = 0;
   return Math_clz32($0) | 0;
  }
  
  function $7($0) {
   $0 = $0 | 0;
-  var $1 = 0, $2 = 0;
   return __wasm_ctz_i32($0) | 0 | 0;
  }
  
@@ -82,13 +77,13 @@ function asmFunc(global, env, buffer) {
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0, $33 = 0, $34 = 0, $35 = 0, $36 = 0;
+  var i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $7 = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $0;
   i64toi32_i32$3 = Math_clz32(i64toi32_i32$0);
   i64toi32_i32$2 = 0;
-  if ((i64toi32_i32$3 | 0) == (32 | 0)) $20 = Math_clz32(i64toi32_i32$1) + 32 | 0; else $20 = i64toi32_i32$3;
-  i64toi32_i32$1 = $20;
+  if ((i64toi32_i32$3 | 0) == (32 | 0)) $7 = Math_clz32(i64toi32_i32$1) + 32 | 0; else $7 = i64toi32_i32$3;
+  i64toi32_i32$1 = $7;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$3 = r;
   return (i64toi32_i32$1 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$2 | 0) == (i64toi32_i32$0 | 0) | 0 | 0;
@@ -99,13 +94,13 @@ function asmFunc(global, env, buffer) {
   $0$hi = $0$hi | 0;
   r = r | 0;
   r$hi = r$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0, $29 = 0, $30 = 0, $31 = 0, $32 = 0, $33 = 0, $34 = 0, $35 = 0, $36 = 0;
+  var i64toi32_i32$3 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $7 = 0, i64toi32_i32$2 = 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $0;
   i64toi32_i32$3 = __wasm_ctz_i32(i64toi32_i32$1) | 0;
   i64toi32_i32$2 = 0;
-  if ((i64toi32_i32$3 | 0) == (32 | 0)) $20 = (__wasm_ctz_i32(i64toi32_i32$0) | 0) + 32 | 0; else $20 = i64toi32_i32$3;
-  i64toi32_i32$1 = $20;
+  if ((i64toi32_i32$3 | 0) == (32 | 0)) $7 = (__wasm_ctz_i32(i64toi32_i32$0) | 0) + 32 | 0; else $7 = i64toi32_i32$3;
+  i64toi32_i32$1 = $7;
   i64toi32_i32$0 = r$hi;
   i64toi32_i32$3 = r;
   return (i64toi32_i32$1 | 0) == (i64toi32_i32$3 | 0) & (i64toi32_i32$2 | 0) == (i64toi32_i32$0 | 0) | 0 | 0;
@@ -113,18 +108,18 @@ function asmFunc(global, env, buffer) {
  
  function __wasm_ctz_i32(x) {
   x = x | 0;
-  var $1 = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0;
-  if ((x | 0) == (0 | 0)) $9 = 32; else $9 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
-  return $9 | 0;
+  var $1 = 0;
+  if ((x | 0) == (0 | 0)) $1 = 32; else $1 = 31 - Math_clz32(x ^ (x - 1 | 0) | 0) | 0;
+  return $1 | 0;
  }
  
  function __wasm_popcnt_i32(x) {
   x = x | 0;
-  var count = 0, $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0;
+  var count = 0, $2 = 0;
   count = 0;
   b : {
    l : do {
-    $5 = count;
+    $2 = count;
     if ((x | 0) == (0 | 0)) break b;
     x = x & (x - 1 | 0) | 0;
     count = count + 1 | 0;
@@ -132,20 +127,18 @@ function asmFunc(global, env, buffer) {
     break l;
    } while (1);
   };
-  return $5 | 0;
+  return $2 | 0;
  }
  
  function __wasm_rotl_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0;
   return ((4294967295 >>> (k & 31 | 0) | 0) & x | 0) << (k & 31 | 0) | 0 | (((4294967295 << (32 - (k & 31 | 0) | 0) | 0) & x | 0) >>> (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
  }
  
  function __wasm_rotr_i32(x, k) {
   x = x | 0;
   k = k | 0;
-  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $20 = 0;
   return ((4294967295 << (k & 31 | 0) | 0) & x | 0) >>> (k & 31 | 0) | 0 | (((4294967295 >>> (32 - (k & 31 | 0) | 0) | 0) & x | 0) << (32 - (k & 31 | 0) | 0) | 0) | 0 | 0;
  }