BinaryenSetFunctionTable now accepts array of func names not funcs. Fixes #1645

Author: jayphelps

CHANGELOG.md

@@ -0,0 +1,17 @@
+This document describes changes between tagged Binaryen versions.
+
+To browse or download snapshots of old tagged versions, visit
+https://github.com/WebAssembly/binaryen/releases.
+
+Not all changes are documented here. In particular, new features, user-oriented
+fixes, options, command-line parameters, usage changes, deprecations,
+significant internal modifications and optimizations etc. generally deserve a
+mention. To examine the full set of changes between versions, visit the link to
+full changeset diff at the end of each section.
+
+Current Trunk
+-------------
+
+### BREAKING CHANGES
+
+- `BinaryenSetFunctionTable` no longer accepts an array of functions, instead it accepts an array of function names, `const char **funcNames`. Previously, you could not include imported functions because they are of type `BinaryenImportRef` instead of `BinaryenFunctionRef`. [#1650](https://github.com/WebAssembly/binaryen/pull/1650)

src/binaryen-c.cpp

@@ -1882,28 +1882,27 @@ void BinaryenRemoveExport(BinaryenModuleRef module, const char* externalName) {
 
 // Function table. One per module
 
-void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* funcs, BinaryenIndex numFuncs) {
+void BinaryenSetFunctionTable(BinaryenModuleRef module, const char **funcNames, BinaryenIndex numFuncNames) {
   if (tracing) {
     std::cout << "  {\n";
-    std::cout << "    BinaryenFunctionRef funcs[] = { ";
-    for (BinaryenIndex i = 0; i < numFuncs; i++) {
+    std::cout << "    const char* funcNames[] = { ";
+    for (BinaryenIndex i = 0; i < numFuncNames; i++) {
       if (i > 0) std::cout << ", ";
-      std::cout << "functions[" << functions[funcs[i]] << "]";
+      std::cout << "\"" << funcNames[i] << "\"";
     }
-    if (numFuncs == 0) std::cout << "0"; // ensure the array is not empty, otherwise a compiler error on VS
     std::cout << " };\n";
-    std::cout << "    BinaryenSetFunctionTable(the_module, funcs, " << numFuncs << ");\n";
+    std::cout << "    BinaryenSetFunctionTable(the_module, funcNames, " << numFuncNames << ");\n";
     std::cout << "  }\n";
   }
 
   auto* wasm = (Module*)module;
   wasm->table.exists = true;
   Table::Segment segment(wasm->allocator.alloc<Const>()->set(Literal(int32_t(0))));
-  for (BinaryenIndex i = 0; i < numFuncs; i++) {
-    segment.data.push_back(((Function*)funcs[i])->name);
+  for (BinaryenIndex i = 0; i < numFuncNames; i++) {
+    segment.data.push_back(funcNames[i]);
   }
   wasm->table.segments.push_back(segment);
-  wasm->table.initial = wasm->table.max = numFuncs;
+  wasm->table.initial = wasm->table.max = numFuncNames;
 }
 
 // Memory. One per module

src/binaryen-c.h

@@ -634,7 +634,7 @@ BinaryenGlobalRef BinaryenAddGlobal(BinaryenModuleRef module, const char* name,
 
 // Function table. One per module
 
-void BinaryenSetFunctionTable(BinaryenModuleRef module, BinaryenFunctionRef* funcs, BinaryenIndex numFuncs);
+void BinaryenSetFunctionTable(BinaryenModuleRef module, const char **funcNames, BinaryenIndex numFuncNames);
 
 // Memory. One per module
 

test/binaryen.js/kitchen-sink.js

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

test/example/c-api-kitchen-sink.c

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

test/example/c-api-kitchen-sink.txt

@@ -1400,9 +1400,10 @@ int main() {
   }
   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[254] = BinaryenConst(the_module, BinaryenLiteralInt32(10));
   {