wasm2js: Support arbitrary temp variable types (#6661)

Previously only basic types were allowed.

Generalizing this to arbitrary types means we use a map instead of a vector,
which is slower, but I can't measure any noticeable difference. Temp vars are
pretty rare, and there are just much slower parts of wasm2js, I think.

3 files changed, 41 insertions, 2 deletions

diff --git a/test/wasm2js/refs.2asm.js b/test/wasm2js/refs.2asm.js
index f1d60af6c..f4c08408f 100644
--- a/test/wasm2js/refs.2asm.js
+++ b/test/wasm2js/refs.2asm.js
@@ -50,6 +50,17 @@ function asmFunc(imports) {
   return temp;
  }
  
+ function funcref_temps($0, $1) {
+  $1 = +$1;
+  var $2 = null, $3 = null, wasm2js_funcref$0 = null, wasm2js_funcref$1 = null, wasm2js_i32$0 = 0;
+  $2 = $0;
+  loop : while (1) {
+   $3 = funcref_temps;
+   break loop;
+  };
+  funcref_temps(funcref_temps, +(+((wasm2js_funcref$0 = $2, wasm2js_funcref$1 = $3 || wasm2js_trap(), wasm2js_i32$0 = 0, wasm2js_i32$0 ? wasm2js_funcref$0 : wasm2js_funcref$1) == null | 0)));
+ }
+ 
  return {
   "null_": null_, 
   "is_null": is_null, 
@@ -57,7 +68,8 @@ function asmFunc(imports) {
   "ref_eq": ref_eq, 
   "ref_as": ref_as, 
   "use_global": use_global, 
-  "use_global_ref": use_global_ref
+  "use_global_ref": use_global_ref, 
+  "funcref_temps": funcref_temps
  };
 }
 
@@ -70,3 +82,4 @@ export var ref_eq = retasmFunc.ref_eq;
 export var ref_as = retasmFunc.ref_as;
 export var use_global = retasmFunc.use_global;
 export var use_global_ref = retasmFunc.use_global_ref;
+export var funcref_temps = retasmFunc.funcref_temps;
diff --git a/test/wasm2js/refs.2asm.js.opt b/test/wasm2js/refs.2asm.js.opt
index fa1947215..0071a15b5 100644
--- a/test/wasm2js/refs.2asm.js.opt
+++ b/test/wasm2js/refs.2asm.js.opt
@@ -48,6 +48,11 @@ function asmFunc(imports) {
   return $1;
  }
  
+ function funcref_temps($0, $1) {
+  $1 = +$1;
+  funcref_temps(funcref_temps, 0.0);
+ }
+ 
  return {
   "null_": null_, 
   "is_null": is_null, 
@@ -55,7 +60,8 @@ function asmFunc(imports) {
   "ref_eq": ref_eq, 
   "ref_as": ref_as, 
   "use_global": use_global, 
-  "use_global_ref": use_global_ref
+  "use_global_ref": use_global_ref, 
+  "funcref_temps": funcref_temps
  };
 }
 
@@ -68,3 +74,4 @@ export var ref_eq = retasmFunc.ref_eq;
 export var ref_as = retasmFunc.ref_as;
 export var use_global = retasmFunc.use_global;
 export var use_global_ref = retasmFunc.use_global_ref;
+export var funcref_temps = retasmFunc.funcref_temps;
diff --git a/test/wasm2js/refs.wast b/test/wasm2js/refs.wast
index 244cf2e97..087567e8c 100644
--- a/test/wasm2js/refs.wast
+++ b/test/wasm2js/refs.wast
@@ -62,4 +62,23 @@
     )
     (local.get $temp)
   )
+
+  (func $funcref_temps (export "funcref_temps") (param $0 funcref) (param $1 f64)
+    ;; A deeply-nested expression that ends up requiring multiple function type
+    ;; temp variables.
+    (call $funcref_temps
+      (ref.func $funcref_temps)
+      (f64.convert_i32_s
+        (ref.is_null
+          (select (result funcref)
+            (local.get $0)
+            (loop $loop (result funcref)
+              (ref.func $funcref_temps)
+            )
+            (i32.const 0)
+          )
+        )
+      )
+    )
+  )
 )