Handle library funcs added during jsifier process. (emscripten-core#20299)

Fixes: emscripten-core#20297

Author: sbc100

emcc.py

@@ -1327,6 +1327,8 @@ def add_js_deps(sym):
 
       for sym in settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE:
         add_js_deps(sym)
+      for sym in js_info['extraLibraryFuncs']:
+        add_js_deps(sym)
       for sym in settings.EXPORTED_RUNTIME_METHODS:
         add_js_deps(shared.demangle_c_symbol_name(sym))
     if settings.ASYNCIFY:

src/embind/embind_ts.js

@@ -591,6 +591,6 @@ var LibraryEmbind = {
   $runDestructors: () => assert(false, 'stub function should not be called'),
 };
 
-DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$embindEmitTypes');
+extraLibraryFuncs.push('$embindEmitTypes');
 
 addToLibrary(LibraryEmbind);

src/jsifier.js

@@ -11,6 +11,8 @@
 
 global.addedLibraryItems = {};
 
+global.extraLibraryFuncs = [];
+
 // Some JS-implemented library functions are proxied to be called on the main
 // browser thread, if the Emscripten runtime is executing in a Web Worker.
 // Each such proxied function is identified via an ordinal number (this is not
@@ -104,6 +106,7 @@ function runJSify() {
   LibraryManager.load();
 
   const symbolsNeeded = DEFAULT_LIBRARY_FUNCS_TO_INCLUDE;
+  symbolsNeeded.push(...extraLibraryFuncs);
   for (const sym of EXPORTED_RUNTIME_METHODS) {
     if ('$' + sym in LibraryManager.library) {
       symbolsNeeded.push('$' + sym);
@@ -651,7 +654,8 @@ var proxiedFunctionTable = [
   if (symbolsOnly) {
     print(JSON.stringify({
       deps: symbolDeps,
-      asyncFuncs
+      asyncFuncs,
+      extraLibraryFuncs,
     }));
   } else {
     finalCombiner();

src/library.js

@@ -3644,7 +3644,7 @@ function autoAddDeps(object, name) {
 #if LEGACY_RUNTIME
 // Library functions that were previously included as runtime functions are
 // automatically included when `LEGACY_RUNTIME` is set.
-DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push(
+extraLibraryFuncs.push(
   '$addFunction',
   '$removeFunction',
   '$allocate',

src/library_async.js

@@ -660,5 +660,5 @@ addToLibrary({
 });
 
 if (ASYNCIFY) {
-  DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$Asyncify');
+  extraLibraryFuncs.push('$Asyncify');
 }

src/library_autodebug.js

@@ -109,7 +109,7 @@ addToLibrary({
   },
 });
 
-DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push(
+extraLibraryFuncs.push(
   '$log_execution',
   '$get_i32',
   '$get_i64',

src/library_fs_shared.js

@@ -176,5 +176,5 @@ addToLibrary({
 // FORCE_FILESYSTEM makes us always include the FS object, which lets the user
 // call APIs on it from JS freely.
 if (FORCE_FILESYSTEM) {
-  DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$FS');
+  extraLibraryFuncs.push('$FS');
 }

src/library_glemu.js

@@ -3905,7 +3905,7 @@ var LibraryGLEmulation = {
 
 // Legacy GL emulation
 if (LEGACY_GL_EMULATION) {
-  DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$GLEmulation');
+  extraLibraryFuncs.push('$GLEmulation');
 }
 
 recordGLProcAddressGet(LibraryGLEmulation);

test/test_other.py

@@ -7122,7 +7122,8 @@ def test_umask_0(self):
     self.run_process([EMCC, 'src.c'])
     self.assertContained('hello, world!', self.run_js('a.out.js'))
 
-  def test_no_missing_symbols(self): # simple hello world should not show any missing symbols
+  def test_no_missing_symbols(self):
+    # simple hello world should not show any missing symbols
     self.run_process([EMCC, test_file('hello_world.c')])
 
     # main() is implemented in C, and even if requested from JS, we should not warn
@@ -7188,6 +7189,20 @@ def test_js_lib_native_deps(self):
 
     self.do_runf('test.c', 'dddddddddd\n', emcc_args=['--js-library', 'lib.js'])
 
+  def test_js_lib_native_deps_extra(self):
+    # Similar to above but the JS symbol is not used by the native code.
+    # Instead is it explictly injected using `extraLibraryFuncs`.
+    create_file('lib.js', r'''
+addToLibrary({
+  jsfunc__deps: ['raise'],
+  jsfunc: (ptr) => {
+    _raise(1);
+  },
+});
+extraLibraryFuncs.push('jsfunc');
+''')
+    self.do_runf(test_file('hello_world.c'), emcc_args=['--js-library', 'lib.js'])
+
   @crossplatform
   def test_realpath(self):
     create_file('src.c', r'''