.

Author: sbc100

emcc.py

@@ -1576,11 +1576,10 @@ def check(input_file):
       # memalign is used to ensure allocated thread stacks are aligned.
       shared.Settings.EXPORTED_FUNCTIONS += ['_memalign', '_malloc']
 
-      if not shared.Settings.WASM:
-        # dynCall_ii is used to call pthread entry points in worker.js (as
-        # metadce does not consider worker.js, which is external, we must
-        # consider it a user export, i.e., one which can never be removed).
-        building.user_requested_exports += ['dynCall_ii']
+      # dynCall_ii is used to call pthread entry points in worker.js (as
+      # metadce does not consider worker.js, which is external, we must
+      # consider it a user export, i.e., one which can never be removed).
+      building.user_requested_exports += ['dynCall_ii']
 
       if shared.Settings.MINIMAL_RUNTIME:
         building.user_requested_exports += ['exit']

src/preamble_minimal.js

@@ -200,17 +200,6 @@ var wasmOffsetConverter;
 #include "wasm_offset_converter.js"
 #endif
 
-/** @param {Array=} args */
-#if ALLOW_ES6
-function dynCallDirect(ptr, ...args) {
-  return wasmTable.get(ptr).apply(null, args);
-}
-#else
-function dynCallDirect(ptr) {
-  return wasmTable.get(ptr).apply(null, Array.prototype.slice.call(arguments, 1));
-}
-#endif
-
 #if EXIT_RUNTIME
 
 function callRuntimeCallbacks(callbacks) {

src/runtime_init_table.js renamed to src/runtime_table.js

@@ -7,3 +7,13 @@ var wasmTable = new WebAssembly.Table({
   'element': 'anyfunc'
 });
 #endif
+
+#if ALLOW_ES6
+function dynCallDirect(ptr, ...args) {
+  return wasmTable.get(ptr).apply(null, args);
+}
+#else
+function dynCallDirect(ptr) {
+  return wasmTable.get(ptr).apply(null, Array.prototype.slice.call(arguments, 1));
+}
+#endif

src/support.js

@@ -600,16 +600,6 @@ function makeBigInt(low, high, unsigned) {
   return unsigned ? ((+((low>>>0)))+((+((high>>>0)))*4294967296.0)) : ((+((low>>>0)))+((+((high|0)))*4294967296.0));
 }
 
-#if ALLOW_ES6
-function dynCallDirect(ptr, ...args) {
-  return wasmTable.get(ptr).apply(null, args);
-}
-#else
-function dynCallDirect(ptr) {
-  return wasmTable.get(ptr).apply(null, Array.prototype.slice.call(arguments, 1));
-}
-#endif
-
 /** @param {Array=} args */
 function dynCall(sig, ptr, args) {
 #if ASSERTIONS

tools/shared.py

@@ -1226,7 +1226,7 @@ def make_invoke(sig, named=True):
     if Settings.WASM_BIGINT or 'j' not in sig:
       new_args = ['a' + str(i) for i in range(1, len(legal_sig))]
       for i in range(len(sig) - 1):
-        if sig[i+1] == 'j':
+        if sig[i + 1] == 'j':
           new_args[i] = 'BigInt(%s)' % new_args[i]
       new_args = ','.join(new_args)
       body = '%sdynCallDirect(index, %s);' % (ret, new_args)