1 files changed, 25 insertions, 32 deletions

diff --git a/test/wasm2js/unaligned.2asm.js.opt b/test/wasm2js/unaligned.2asm.js.opt
index 379067cca..bbca2c8bf 100644
--- a/test/wasm2js/unaligned.2asm.js.opt
+++ b/test/wasm2js/unaligned.2asm.js.opt
@@ -50,64 +50,57 @@ function asmFunc(global, env, buffer) {
  var setTempRet0 = env.setTempRet0;
  var i64toi32_i32$HIGH_BITS = 0;
  function $0() {
-  var $0_1 = 0;
-  return HEAPU8[0 | 0] | HEAPU8[$0_1 + 1 | 0] << 8 | (HEAPU8[$0_1 + 2 | 0] << 16 | HEAPU8[$0_1 + 3 | 0] << 24);
+  return HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24);
  }
  
  function $1() {
-  var $0_1 = 0, $1_1 = 0;
-  $0_1 = HEAPU8[0 | 0] | HEAPU8[$0_1 + 1 | 0] << 8 | (HEAPU8[$0_1 + 2 | 0] << 16 | HEAPU8[$0_1 + 3 | 0] << 24);
-  i64toi32_i32$HIGH_BITS = HEAPU8[$1_1 + 4 | 0] | HEAPU8[$1_1 + 5 | 0] << 8 | (HEAPU8[$1_1 + 6 | 0] << 16 | HEAPU8[$1_1 + 7 | 0] << 24);
-  return $0_1 | 0;
+  i64toi32_i32$HIGH_BITS = HEAPU8[4 | 0] | HEAPU8[5 | 0] << 8 | (HEAPU8[6 | 0] << 16 | HEAPU8[7 | 0] << 24);
+  return HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24);
  }
  
  function $2() {
-  var $0_1 = 0;
-  return Math_fround((wasm2js_scratch_store_i32(0, HEAPU8[0 | 0] | HEAPU8[$0_1 + 1 | 0] << 8 | (HEAPU8[$0_1 + 2 | 0] << 16 | HEAPU8[$0_1 + 3 | 0] << 24)), wasm2js_scratch_load_f32()));
+  return Math_fround((wasm2js_scratch_store_i32(0, HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24)), wasm2js_scratch_load_f32()));
  }
  
  function $3() {
-  var $0_1 = 0, $1_1 = 0;
-  $1_1 = HEAPU8[0 | 0] | HEAPU8[$1_1 + 1 | 0] << 8 | (HEAPU8[$1_1 + 2 | 0] << 16 | HEAPU8[$1_1 + 3 | 0] << 24);
-  $0_1 = HEAPU8[$0_1 + 4 | 0] | HEAPU8[$0_1 + 5 | 0] << 8 | (HEAPU8[$0_1 + 6 | 0] << 16 | HEAPU8[$0_1 + 7 | 0] << 24);
-  wasm2js_scratch_store_i32(0 | 0, $1_1 | 0);
+  var $0_1 = 0;
+  $0_1 = HEAPU8[4 | 0] | HEAPU8[5 | 0] << 8 | (HEAPU8[6 | 0] << 16 | HEAPU8[7 | 0] << 24);
+  wasm2js_scratch_store_i32(0 | 0, HEAPU8[0 | 0] | HEAPU8[1 | 0] << 8 | (HEAPU8[2 | 0] << 16 | HEAPU8[3 | 0] << 24));
   wasm2js_scratch_store_i32(1 | 0, $0_1 | 0);
   return +wasm2js_scratch_load_f64();
  }
  
  function $4() {
-  var $0_1 = 0, $1_1 = 0;
   HEAP8[0 | 0] = 0;
-  HEAP8[$0_1 + 1 | 0] = $1_1 >>> 8;
-  HEAP8[$0_1 + 2 | 0] = $1_1 >>> 16;
-  HEAP8[$0_1 + 3 | 0] = $1_1 >>> 24;
+  HEAP8[1 | 0] = 0;
+  HEAP8[2 | 0] = 0;
+  HEAP8[3 | 0] = 0;
  }
  
  function $5() {
-  var $0_1 = 0, $1_1 = 0, $2_1 = 0;
   HEAP8[0 | 0] = 0;
-  HEAP8[$0_1 + 1 | 0] = $2_1 >>> 8;
-  HEAP8[$0_1 + 2 | 0] = $2_1 >>> 16;
-  HEAP8[$0_1 + 3 | 0] = $2_1 >>> 24;
-  HEAP8[$1_1 + 4 | 0] = 0;
-  HEAP8[$1_1 + 5 | 0] = $0_1 >>> 8;
-  HEAP8[$1_1 + 6 | 0] = $0_1 >>> 16;
-  HEAP8[$1_1 + 7 | 0] = $0_1 >>> 24;
+  HEAP8[1 | 0] = 0;
+  HEAP8[2 | 0] = 0;
+  HEAP8[3 | 0] = 0;
+  HEAP8[4 | 0] = 0;
+  HEAP8[5 | 0] = 0;
+  HEAP8[6 | 0] = 0;
+  HEAP8[7 | 0] = 0;
  }
  
  function $7() {
-  var $0_1 = 0, $1_1 = 0, $2_1 = 0, $3_1 = 0;
+  var $0_1 = 0, $1_1 = 0;
   wasm2js_scratch_store_f64(0.0);
   $0_1 = wasm2js_scratch_load_i32(1 | 0) | 0;
   $1_1 = wasm2js_scratch_load_i32(0 | 0) | 0;
   HEAP8[0 | 0] = $1_1;
-  HEAP8[$3_1 + 1 | 0] = $1_1 >>> 8;
-  HEAP8[$3_1 + 2 | 0] = $1_1 >>> 16;
-  HEAP8[$3_1 + 3 | 0] = $1_1 >>> 24;
-  HEAP8[$2_1 + 4 | 0] = $0_1;
-  HEAP8[$2_1 + 5 | 0] = $0_1 >>> 8;
-  HEAP8[$2_1 + 6 | 0] = $0_1 >>> 16;
-  HEAP8[$2_1 + 7 | 0] = $0_1 >>> 24;
+  HEAP8[1 | 0] = $1_1 >>> 8;
+  HEAP8[2 | 0] = $1_1 >>> 16;
+  HEAP8[3 | 0] = $1_1 >>> 24;
+  HEAP8[4 | 0] = $0_1;
+  HEAP8[5 | 0] = $0_1 >>> 8;
+  HEAP8[6 | 0] = $0_1 >>> 16;
+  HEAP8[7 | 0] = $0_1 >>> 24;
  }
  
  function legalstub$1() {