add tableName for indirect calls (#2125)

Author: MaxGraey

src/builtins.ts

@@ -3288,7 +3288,7 @@ function builtin_call_indirect(ctx: BuiltinContext): ExpressionRef {
     paramTypeRefs[i] = compiler.currentType.toRef();
   }
   compiler.currentType = returnType;
-  return module.call_indirect(indexArg, operandExprs, createType(paramTypeRefs), returnType.toRef());
+  return module.call_indirect(null /* TODO */, indexArg, operandExprs, createType(paramTypeRefs), returnType.toRef());
 }
 builtins.set(BuiltinNames.call_indirect, builtin_call_indirect);
 

src/compiler.ts

@@ -7375,6 +7375,7 @@ export class Compiler extends DiagnosticEmitter {
     }
     if (operands) this.operandsTostack(signature, operands);
     var expr = module.call_indirect(
+      null, // TODO: handle multiple tables
       module.load(4, false, functionArg, TypeRef.I32), // ._index
       operands,
       signature.paramRefs,

src/module.ts

@@ -1567,13 +1567,14 @@ export class Module {
   }
 
   call_indirect(
+    tableName: string | null,
     index: ExpressionRef,
     operands: ExpressionRef[] | null,
     params: TypeRef,
     results: TypeRef,
     isReturn: bool = false
   ): ExpressionRef {
-    var cStr = this.allocStringCached("0"); // TODO: multiple tables
+    var cStr = this.allocStringCached(tableName !== null ? tableName : "0");
     var cArr = allocPtrArray(operands);
     var ret = isReturn
       ? binaryen._BinaryenReturnCallIndirect(
@@ -1587,13 +1588,13 @@ export class Module {
   }
 
   return_call_indirect(
-    tableName: string,
+    tableName: string | null,
     index: ExpressionRef,
     operands: ExpressionRef[] | null,
     params: TypeRef,
     results: TypeRef
   ): ExpressionRef {
-    return this.call_indirect(index, operands, params, results, true);
+    return this.call_indirect(tableName, index, operands, params, results, true);
   }
 
   unreachable(): ExpressionRef {