Fix i64 select lowering. (#1773)

4 files changed, 85 insertions, 9 deletions

diff --git a/test/wasm2js/i64-select.2asm.js b/test/wasm2js/i64-select.2asm.js
new file mode 100644
index 000000000..dab62286c
--- /dev/null
+++ b/test/wasm2js/i64-select.2asm.js
@@ -0,0 +1,52 @@
+function asmFunc(global, env, buffer) {
+ "use asm";
+ var HEAP8 = new global.Int8Array(buffer);
+ var HEAP16 = new global.Int16Array(buffer);
+ var HEAP32 = new global.Int32Array(buffer);
+ var HEAPU8 = new global.Uint8Array(buffer);
+ var HEAPU16 = new global.Uint16Array(buffer);
+ var HEAPU32 = new global.Uint32Array(buffer);
+ var HEAPF32 = new global.Float32Array(buffer);
+ var HEAPF64 = new global.Float64Array(buffer);
+ var Math_imul = global.Math.imul;
+ var Math_fround = global.Math.fround;
+ var Math_abs = global.Math.abs;
+ var Math_clz32 = global.Math.clz32;
+ var Math_min = global.Math.min;
+ var Math_max = global.Math.max;
+ var Math_floor = global.Math.floor;
+ var Math_ceil = global.Math.ceil;
+ var Math_sqrt = global.Math.sqrt;
+ var abort = env.abort;
+ var nan = global.NaN;
+ var infinity = global.Infinity;
+ var i64toi32_i32$HIGH_BITS = 0;
+ function p(i) {
+  i = i | 0;
+  return i | 0;
+ }
+ 
+ function $1($0) {
+  $0 = $0 | 0;
+  var wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
+  return (wasm2js_i32$0 = p(4294967295 | 0) | 0, wasm2js_i32$1 = p(0 | 0) | 0, wasm2js_i32$2 = 1, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1) | 0;
+ }
+ 
+ function $2() {
+  var i64toi32_i32$3 = 0, i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
+  i64toi32_i32$4 = 1;
+  i64toi32_i32$3 = (wasm2js_i32$0 = 4294967295, wasm2js_i32$1 = 0, wasm2js_i32$2 = i64toi32_i32$4, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1);
+  i64toi32_i32$2 = (wasm2js_i32$0 = 4294967295, wasm2js_i32$1 = 0, wasm2js_i32$2 = i64toi32_i32$4, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1);
+  i64toi32_i32$2 = i64toi32_i32$2;
+  i64toi32_i32$3 = i64toi32_i32$3;
+  i64toi32_i32$HIGH_BITS = i64toi32_i32$2;
+  return i64toi32_i32$3 | 0;
+ }
+ 
+ return {
+  
+ };
+}
+
+const memasmFunc = new ArrayBuffer(65536);
+const retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); }},memasmFunc);
diff --git a/test/wasm2js/i64-select.wast b/test/wasm2js/i64-select.wast
new file mode 100644
index 000000000..0fa2675a3
--- /dev/null
+++ b/test/wasm2js/i64-select.wast
@@ -0,0 +1,23 @@
+;; Testing i64 select
+
+(module
+ (func $p (param $i i32) (result i32) (get_local $i))
+ (func (param i32) (result i64)
+  (return
+   (select
+    (call $p (i32.const -1))
+    (call $p (i32.const 0))
+    (i32.const 1)
+   )
+  )
+ )
+ (func (result i64)
+  (return
+   (select
+    (i64.const -1)
+    (i64.const 0)
+    (i32.const 1)
+   )   
+  )    
+ )
+)
diff --git a/test/wasm2js/left-to-right.2asm.js b/test/wasm2js/left-to-right.2asm.js
index 9b51b18bd..959190b04 100644
--- a/test/wasm2js/left-to-right.2asm.js
+++ b/test/wasm2js/left-to-right.2asm.js
@@ -1061,7 +1061,7 @@ function asmFunc(global, env, buffer) {
  }
  
  function $93() {
-  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$1 = 0, i64toi32_i32$4 = 0, $0 = 0, $0$hi = 0, $1 = 0, $1$hi = 0;
   reset();
   i64toi32_i32$0 = i64_left() | 0;
   i64toi32_i32$1 = i64toi32_i32$HIGH_BITS;
@@ -1071,11 +1071,9 @@ function asmFunc(global, env, buffer) {
   i64toi32_i32$0 = i64toi32_i32$HIGH_BITS;
   $1 = i64toi32_i32$1;
   $1$hi = i64toi32_i32$0;
+  i64toi32_i32$4 = i64_bool() | 0;
   i64toi32_i32$0 = $0$hi;
   i64toi32_i32$1 = $1$hi;
-  i64toi32_i32$0 = i64toi32_i32$1;
-  i64toi32_i32$0 = i64toi32_i32$1;
-  i64_bool() | 0;
   return get() | 0 | 0;
  }
  
diff --git a/test/wasm2js/select.2asm.js b/test/wasm2js/select.2asm.js
index cdbdd19aa..672a7fe6c 100644
--- a/test/wasm2js/select.2asm.js
+++ b/test/wasm2js/select.2asm.js
@@ -35,14 +35,17 @@ function asmFunc(global, env, buffer) {
   rhs = rhs | 0;
   rhs$hi = rhs$hi | 0;
   cond = cond | 0;
-  var i64toi32_i32$0 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
+  var i64toi32_i32$0 = 0, i64toi32_i32$3 = 0, i64toi32_i32$2 = 0, i64toi32_i32$4 = 0, wasm2js_i32$0 = 0, wasm2js_i32$1 = 0, wasm2js_i32$2 = 0;
   i64toi32_i32$0 = lhs$hi;
   i64toi32_i32$0 = rhs$hi;
+  i64toi32_i32$4 = cond;
   i64toi32_i32$0 = lhs$hi;
-  i64toi32_i32$0 = rhs$hi;
-  i64toi32_i32$0 = i64toi32_i32$0;
-  i64toi32_i32$HIGH_BITS = i64toi32_i32$0;
-  return (wasm2js_i32$0 = lhs, wasm2js_i32$1 = rhs, wasm2js_i32$2 = cond, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1) | 0;
+  i64toi32_i32$3 = (wasm2js_i32$0 = lhs, wasm2js_i32$1 = rhs, wasm2js_i32$2 = i64toi32_i32$4, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1);
+  i64toi32_i32$2 = (wasm2js_i32$0 = i64toi32_i32$0, wasm2js_i32$1 = rhs$hi, wasm2js_i32$2 = i64toi32_i32$4, wasm2js_i32$2 ? wasm2js_i32$0 : wasm2js_i32$1);
+  i64toi32_i32$2 = i64toi32_i32$2;
+  i64toi32_i32$3 = i64toi32_i32$3;
+  i64toi32_i32$HIGH_BITS = i64toi32_i32$2;
+  return i64toi32_i32$3 | 0;
  }
  
  function $2(lhs, rhs, cond) {