wasm2js: get rid of some non-flat code assumptions (#2036)

We run flatten there, which lets us simplify things a lot. Turns out that for assertions we didn't run it, which is why we still needed the old non-flat code paths. This adds flatten there and removes that old code and assumptions.

1 files changed, 14 insertions, 38 deletions

diff --git a/test/wasm2js/endianness.2asm.js b/test/wasm2js/endianness.2asm.js
index 9696bc3dd..257d62eeb 100644
--- a/test/wasm2js/endianness.2asm.js
+++ b/test/wasm2js/endianness.2asm.js
@@ -57,13 +57,8 @@ function asmFunc(global, env, buffer) {
  function i16_store_little(address, value) {
   address = address | 0;
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = address;
-  wasm2js_i32$1 = value;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
-  wasm2js_i32$0 = address + 1 | 0;
-  wasm2js_i32$1 = value >>> 8 | 0;
-  HEAP8[wasm2js_i32$0 >> 0] = wasm2js_i32$1;
+  HEAP8[address >> 0] = value;
+  HEAP8[(address + 1 | 0) >> 0] = value >>> 8 | 0;
  }
  
  function i32_store_little(address, value) {
@@ -238,30 +233,22 @@ function asmFunc(global, env, buffer) {
  
  function $16(value) {
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
+  HEAP16[0 >> 1] = value;
   return i16_load_little(0 | 0) | 0 | 0;
  }
  
  function $17(value) {
   value = value | 0;
-  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  HEAP32[0 >> 2] = value;
   return i32_load_little(0 | 0) | 0 | 0;
  }
  
  function $18(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP16[wasm2js_i32$0 >> 1] = wasm2js_i32$1;
+  HEAP16[0 >> 1] = value;
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = i16_load_little(0 | 0) | 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
@@ -271,11 +258,9 @@ function asmFunc(global, env, buffer) {
  function $19(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
-  wasm2js_i32$0 = 0;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
+  HEAP32[0 >> 2] = value;
   i64toi32_i32$0 = 0;
   i64toi32_i32$1 = i32_load_little(0 | 0) | 0;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
@@ -285,15 +270,11 @@ function asmFunc(global, env, buffer) {
  function $20(value, value$hi) {
   value = value | 0;
   value$hi = value$hi | 0;
-  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0, wasm2js_i32$3 = 0;
+  var i64toi32_i32$1 = 0, i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0;
   i64toi32_i32$0 = value$hi;
   i64toi32_i32$1 = 0;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = value;
-  HEAP32[wasm2js_i32$0 >> 2] = wasm2js_i32$1;
-  wasm2js_i32$0 = i64toi32_i32$1;
-  wasm2js_i32$1 = i64toi32_i32$0;
-  (wasm2js_i32$2 = wasm2js_i32$0, wasm2js_i32$3 = wasm2js_i32$1), ((HEAP8[(wasm2js_i32$2 + 4 | 0) >> 0] = wasm2js_i32$3 & 255 | 0, HEAP8[(wasm2js_i32$2 + 5 | 0) >> 0] = (wasm2js_i32$3 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 6 | 0) >> 0] = (wasm2js_i32$3 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$2 + 7 | 0) >> 0] = (wasm2js_i32$3 >>> 24 | 0) & 255 | 0;
+  HEAP32[i64toi32_i32$1 >> 2] = value;
+  (wasm2js_i32$0 = i64toi32_i32$1, wasm2js_i32$1 = i64toi32_i32$0), ((HEAP8[(wasm2js_i32$0 + 4 | 0) >> 0] = wasm2js_i32$1 & 255 | 0, HEAP8[(wasm2js_i32$0 + 5 | 0) >> 0] = (wasm2js_i32$1 >>> 8 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 6 | 0) >> 0] = (wasm2js_i32$1 >>> 16 | 0) & 255 | 0), HEAP8[(wasm2js_i32$0 + 7 | 0) >> 0] = (wasm2js_i32$1 >>> 24 | 0) & 255 | 0;
   i64toi32_i32$0 = i64_load_little(0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   i64toi32_i32$HIGH_BITS = i64toi32_i32$1;
@@ -302,19 +283,14 @@ function asmFunc(global, env, buffer) {
  
  function $21(value) {
   value = Math_fround(value);
-  var wasm2js_i32$0 = 0, wasm2js_f32$0 = Math_fround(0);
-  wasm2js_i32$0 = 0;
-  wasm2js_f32$0 = value;
-  HEAPF32[wasm2js_i32$0 >> 2] = wasm2js_f32$0;
+  HEAPF32[0 >> 2] = value;
   return Math_fround((wasm2js_scratch_store_i32(0, i32_load_little(0 | 0) | 0), wasm2js_scratch_load_f32()));
  }
  
  function $22(value) {
   value = +value;
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, wasm2js_i32$0 = 0, wasm2js_f64$0 = 0.0;
-  wasm2js_i32$0 = 0;
-  wasm2js_f64$0 = value;
-  HEAPF64[wasm2js_i32$0 >> 3] = wasm2js_f64$0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0;
+  HEAPF64[0 >> 3] = value;
   i64toi32_i32$0 = i64_load_little(0 | 0) | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
   wasm2js_scratch_store_i32(0 | 0, i64toi32_i32$0 | 0);