use strToStack for js setFunctionTable and update wasm.js et al

Author: jayphelps

bin/wasm.js

@@ -1131,15 +1131,9 @@ Module['Module'] = function(module) {
   };
   this['setFunctionTable'] = function(funcNames) {
     return preserveStack(function() {
-      return Module['_BinaryenSetFunctionTable'](
-        module,
-        i32sToStack(
-          funcNames.map(function(funcName) {
-            return allocate(funcName, 'i8', ALLOC_STACK);
-          })
-        ),
-        funcNames.length
-      );
+      return Module['_BinaryenSetFunctionTable'](module, i32sToStack(
+          funcNames.map(strToStack)
+        ), funcNames.length);
     });
   };
   this['setMemory'] = function(initial, maximum, exportName, segments) {
@@ -1532,6 +1526,11 @@ Module['getFunctionInfo'] = function(func) {
   };
 };
 
+// Obtains name for a 'Function'
+Module['getFunctionName'] = function(func) {
+  return Pointer_stringify(Module['_BinaryenFunctionGetName'](func));
+};
+
 // Obtains information about an 'Import'
 Module['getImportInfo'] = function(import_) {
   return {

src/js/binaryen.js-post.js

@@ -31,3 +31,6 @@ function asmFunc(global, env, buffer) {
  };
 }
 
+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);
+

test/binaryen.js/emit_asmjs.js.txt

@@ -250,7 +250,7 @@ function test_core() {
 
   // Function table. One per module
 
-  module.setFunctionTable([ Binaryen.getFunctionInfo(sinker).name ]);
+  module.setFunctionTable([ Binaryen.getFunctionName(sinker) ]);
 
   // Memory. One per module
 

test/binaryen.js/kitchen-sink.js

@@ -1456,9 +1456,10 @@ getExpressionInfo(f64.const)={"id":15,"type":4,"value":9.5}
   }
   imports[0] = BinaryenAddFunctionImport(the_module, "an-imported", "module", "base", functionTypes[1]);
   exports[0] = BinaryenAddFunctionExport(the_module, "kitchen()sinker", "kitchen_sinker");
+  BinaryenFunctionGetName(functions[0]);
   {
-    BinaryenFunctionRef funcs[] = { functions[0] };
-    BinaryenSetFunctionTable(the_module, funcs, 1);
+    const char* funcNames[] = { "kitchen()sinker" };
+    BinaryenSetFunctionTable(the_module, funcNames, 1);
   }
   expressions[256] = BinaryenConst(the_module, BinaryenLiteralInt32(10));
   {

test/binaryen.js/kitchen-sink.js.txt

@@ -253,7 +253,7 @@ void test_core() {
   BinaryenAddFunctionExport(module, "kitchen()sinker", "kitchen_sinker");
 
   // Function table. One per module
-  const char** funcNames[] = { BinaryenFunctionGetName(sinker) };
+  const char* funcNames[] = { BinaryenFunctionGetName(sinker) };
   BinaryenSetFunctionTable(module, funcNames, 1);
 
   // Memory. One per module