Optimize away sets of the same local (#1940)

1 files changed, 6 insertions, 57 deletions

diff --git a/test/wasm2js/stack-modified.2asm.js b/test/wasm2js/stack-modified.2asm.js
index 099eb1893..1b65bb24b 100644
--- a/test/wasm2js/stack-modified.2asm.js
+++ b/test/wasm2js/stack-modified.2asm.js
@@ -24,9 +24,8 @@ function asmFunc(global, env, buffer) {
  function $0(var$0, var$0$hi) {
   var$0 = var$0 | 0;
   var$0$hi = var$0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, i64toi32_i32$5 = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$1 = var$0;
   var$1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -35,7 +34,6 @@ function asmFunc(global, env, buffer) {
   label$1 : {
    label$2 : do {
     i64toi32_i32$0 = var$1$hi;
-    i64toi32_i32$0 = i64toi32_i32$0;
     i64toi32_i32$2 = var$1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
@@ -46,17 +44,14 @@ function asmFunc(global, env, buffer) {
      i64toi32_i32$0 = var$2$hi;
      i64toi32_i32$0 = __wasm_i64_mul(var$1 | 0, i64toi32_i32$2 | 0, var$2 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-     i64toi32_i32$2 = i64toi32_i32$2;
      var$2 = i64toi32_i32$0;
      var$2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = var$1$hi;
-     i64toi32_i32$2 = i64toi32_i32$2;
      i64toi32_i32$3 = var$1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     i64toi32_i32$5 = i64toi32_i32$5;
      var$1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      var$1$hi = i64toi32_i32$5;
     };
@@ -65,9 +60,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
   };
   i64toi32_i32$5 = var$2$hi;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
   i64toi32_i32$3 = var$2;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
   return i64toi32_i32$3 | 0;
@@ -76,9 +68,8 @@ function asmFunc(global, env, buffer) {
  function $1(var$0, var$0$hi) {
   var$0 = var$0 | 0;
   var$0$hi = var$0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, i64toi32_i32$5 = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$1 = var$0;
   var$1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -87,7 +78,6 @@ function asmFunc(global, env, buffer) {
   label$1 : {
    label$2 : do {
     i64toi32_i32$0 = var$1$hi;
-    i64toi32_i32$0 = i64toi32_i32$0;
     i64toi32_i32$2 = var$1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
@@ -98,17 +88,14 @@ function asmFunc(global, env, buffer) {
      i64toi32_i32$0 = var$2$hi;
      i64toi32_i32$0 = __wasm_i64_mul(var$1 | 0, i64toi32_i32$2 | 0, var$2 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-     i64toi32_i32$2 = i64toi32_i32$2;
      var$2 = i64toi32_i32$0;
      var$2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = var$1$hi;
-     i64toi32_i32$2 = i64toi32_i32$2;
      i64toi32_i32$3 = var$1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     i64toi32_i32$5 = i64toi32_i32$5;
      var$1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      var$1$hi = i64toi32_i32$5;
     };
@@ -117,9 +104,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
   };
   i64toi32_i32$5 = var$2$hi;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
   i64toi32_i32$3 = var$2;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
   return i64toi32_i32$3 | 0;
@@ -128,9 +112,8 @@ function asmFunc(global, env, buffer) {
  function $2(var$0, var$0$hi) {
   var$0 = var$0 | 0;
   var$0$hi = var$0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, i64toi32_i32$5 = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$1 = var$0;
   var$1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -139,7 +122,6 @@ function asmFunc(global, env, buffer) {
   label$1 : {
    label$2 : do {
     i64toi32_i32$0 = var$1$hi;
-    i64toi32_i32$0 = i64toi32_i32$0;
     i64toi32_i32$2 = var$1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
@@ -150,17 +132,14 @@ function asmFunc(global, env, buffer) {
      i64toi32_i32$0 = var$2$hi;
      i64toi32_i32$0 = __wasm_i64_mul(var$1 | 0, i64toi32_i32$2 | 0, var$2 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-     i64toi32_i32$2 = i64toi32_i32$2;
      var$2 = i64toi32_i32$0;
      var$2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = var$1$hi;
-     i64toi32_i32$2 = i64toi32_i32$2;
      i64toi32_i32$3 = var$1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     i64toi32_i32$5 = i64toi32_i32$5;
      var$1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      var$1$hi = i64toi32_i32$5;
     };
@@ -169,9 +148,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
   };
   i64toi32_i32$5 = var$2$hi;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
   i64toi32_i32$3 = var$2;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
   return i64toi32_i32$3 | 0;
@@ -180,9 +156,8 @@ function asmFunc(global, env, buffer) {
  function $3(var$0, var$0$hi) {
   var$0 = var$0 | 0;
   var$0$hi = var$0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, i64toi32_i32$5 = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$1 = var$0;
   var$1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -191,7 +166,6 @@ function asmFunc(global, env, buffer) {
   label$1 : {
    label$2 : do {
     i64toi32_i32$0 = var$1$hi;
-    i64toi32_i32$0 = i64toi32_i32$0;
     i64toi32_i32$2 = var$1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
@@ -202,17 +176,14 @@ function asmFunc(global, env, buffer) {
      i64toi32_i32$0 = var$2$hi;
      i64toi32_i32$0 = __wasm_i64_mul(var$1 | 0, i64toi32_i32$2 | 0, var$2 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-     i64toi32_i32$2 = i64toi32_i32$2;
      var$2 = i64toi32_i32$0;
      var$2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = var$1$hi;
-     i64toi32_i32$2 = i64toi32_i32$2;
      i64toi32_i32$3 = var$1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     i64toi32_i32$5 = i64toi32_i32$5;
      var$1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      var$1$hi = i64toi32_i32$5;
     };
@@ -221,9 +192,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
   };
   i64toi32_i32$5 = var$2$hi;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
   i64toi32_i32$3 = var$2;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
   return i64toi32_i32$3 | 0;
@@ -232,9 +200,8 @@ function asmFunc(global, env, buffer) {
  function $4(var$0, var$0$hi) {
   var$0 = var$0 | 0;
   var$0$hi = var$0$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$5 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$1$hi = 0, i64toi32_i32$5 = 0, var$1 = 0, var$2$hi = 0, i64toi32_i32$1 = 0, var$2 = 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$1 = var$0;
   var$1$hi = i64toi32_i32$0;
   i64toi32_i32$0 = 0;
@@ -243,7 +210,6 @@ function asmFunc(global, env, buffer) {
   label$1 : {
    label$2 : do {
     i64toi32_i32$0 = var$1$hi;
-    i64toi32_i32$0 = i64toi32_i32$0;
     i64toi32_i32$2 = var$1;
     i64toi32_i32$1 = 0;
     i64toi32_i32$3 = 0;
@@ -254,17 +220,14 @@ function asmFunc(global, env, buffer) {
      i64toi32_i32$0 = var$2$hi;
      i64toi32_i32$0 = __wasm_i64_mul(var$1 | 0, i64toi32_i32$2 | 0, var$2 | 0, i64toi32_i32$0 | 0) | 0;
      i64toi32_i32$2 = i64toi32_i32$HIGH_BITS;
-     i64toi32_i32$2 = i64toi32_i32$2;
      var$2 = i64toi32_i32$0;
      var$2$hi = i64toi32_i32$2;
      i64toi32_i32$2 = var$1$hi;
-     i64toi32_i32$2 = i64toi32_i32$2;
      i64toi32_i32$3 = var$1;
      i64toi32_i32$0 = 0;
      i64toi32_i32$1 = 1;
      i64toi32_i32$5 = (i64toi32_i32$3 >>> 0 < i64toi32_i32$1 >>> 0) + i64toi32_i32$0 | 0;
      i64toi32_i32$5 = i64toi32_i32$2 - i64toi32_i32$5 | 0;
-     i64toi32_i32$5 = i64toi32_i32$5;
      var$1 = i64toi32_i32$3 - i64toi32_i32$1 | 0;
      var$1$hi = i64toi32_i32$5;
     };
@@ -273,9 +236,6 @@ function asmFunc(global, env, buffer) {
    } while (1);
   };
   i64toi32_i32$5 = var$2$hi;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
-  i64toi32_i32$5 = i64toi32_i32$5;
   i64toi32_i32$3 = var$2;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$5;
   return i64toi32_i32$3 | 0;
@@ -286,19 +246,15 @@ function asmFunc(global, env, buffer) {
   var$0$hi = var$0$hi | 0;
   var$1 = var$1 | 0;
   var$1$hi = var$1$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, i64toi32_i32$2 = 0, var$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21 = 0, $22 = 0, var$6 = 0, $24 = 0, $17 = 0, $18 = 0, $23 = 0, $29 = 0, $45 = 0, $56$hi = 0, $62$hi = 0;
+  var i64toi32_i32$4 = 0, i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, var$2 = 0, i64toi32_i32$2 = 0, i64toi32_i32$3 = 0, var$3 = 0, var$4 = 0, var$5 = 0, $21 = 0, $22 = 0, var$6 = 0, $24 = 0, $17 = 0, $18 = 0, $23 = 0, $29 = 0, $45 = 0, $56$hi = 0, $62$hi = 0;
   i64toi32_i32$0 = var$1$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$2 = var$1;
   var$4 = var$2 >>> 16 | 0;
   i64toi32_i32$0 = var$0$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
   var$3 = var$0;
   var$5 = var$3 >>> 16 | 0;
   $17 = Math_imul(var$4, var$5);
   $18 = var$2;
-  i64toi32_i32$0 = i64toi32_i32$0;
-  i64toi32_i32$0 = i64toi32_i32$0;
   i64toi32_i32$2 = var$3;
   i64toi32_i32$1 = 0;
   i64toi32_i32$3 = 32;
@@ -310,10 +266,8 @@ function asmFunc(global, env, buffer) {
    i64toi32_i32$1 = i64toi32_i32$0 >>> i64toi32_i32$4 | 0;
    $21 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$0 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$2 >>> i64toi32_i32$4 | 0) | 0;
   }
-  i64toi32_i32$1 = i64toi32_i32$1;
   $23 = $17 + Math_imul($18, $21) | 0;
   i64toi32_i32$1 = var$1$hi;
-  i64toi32_i32$1 = i64toi32_i32$1;
   i64toi32_i32$0 = var$1;
   i64toi32_i32$2 = 0;
   i64toi32_i32$3 = 32;
@@ -325,7 +279,6 @@ function asmFunc(global, env, buffer) {
    i64toi32_i32$2 = i64toi32_i32$1 >>> i64toi32_i32$4 | 0;
    $22 = (((1 << i64toi32_i32$4 | 0) - 1 | 0) & i64toi32_i32$1 | 0) << (32 - i64toi32_i32$4 | 0) | 0 | (i64toi32_i32$0 >>> i64toi32_i32$4 | 0) | 0;
   }
-  i64toi32_i32$2 = i64toi32_i32$2;
   $29 = $23 + Math_imul($22, var$3) | 0;
   var$2 = var$2 & 65535 | 0;
   var$3 = var$3 & 65535 | 0;
@@ -334,7 +287,6 @@ function asmFunc(global, env, buffer) {
   $45 = $29 + (var$2 >>> 16 | 0) | 0;
   var$2 = (var$2 & 65535 | 0) + Math_imul(var$4, var$3) | 0;
   i64toi32_i32$2 = 0;
-  i64toi32_i32$2 = i64toi32_i32$2;
   i64toi32_i32$1 = $45 + (var$2 >>> 16 | 0) | 0;
   i64toi32_i32$0 = 0;
   i64toi32_i32$3 = 32;
@@ -354,7 +306,6 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$1 = $62$hi;
   i64toi32_i32$3 = var$2 << 16 | 0 | (var$6 & 65535 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$0 | i64toi32_i32$1 | 0;
-  i64toi32_i32$1 = i64toi32_i32$1;
   i64toi32_i32$2 = i64toi32_i32$2 | i64toi32_i32$3 | 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
   return i64toi32_i32$2 | 0;
@@ -372,8 +323,6 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$1 = var$1$hi;
   i64toi32_i32$1 = _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE(var$0 | 0, i64toi32_i32$0 | 0, var$1 | 0, i64toi32_i32$1 | 0) | 0;
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
-  i64toi32_i32$0 = i64toi32_i32$0;
-  i64toi32_i32$1 = i64toi32_i32$1;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
   return i64toi32_i32$1 | 0;
  }