Remove redundant __deps entries and autoAddDeps calls across JS libraries

Warn when an explicit `__deps` entry duplicates an auto-detected
dependency, and remove all `autoAddDeps` calls and redundant `__deps`
entries across `src/lib/*.js` and the test suite.

Fixes: #19098

Author: sbc100

src/jsifier.mjs

@@ -297,7 +297,11 @@ function calculateDeps(snippet, deps, symbol, symbolsOnly = false) {
   }
 
   for (const dep of found) {
-    if (!deps.includes(dep)) {
+    if (deps.includes(dep)) {
+      if (!symbolsOnly && symbol && LibraryManager.library[symbol] !== dep) {
+        warn(`${symbol}: redundant __deps entry: ${dep}`);
+      }
+    } else {
       if (!symbolsOnly && symbol) {
         debugLog(`auto-detected dependency: ${symbol} -> ${dep}`);
       }

src/lib/libaddfunction.js

@@ -35,7 +35,6 @@ addToLibrary({
   }`,
 
   $generateTypePack__internal: true,
-  $generateTypePack__deps: ['$uleb128EncodeWithLen', '$wasmTypeCodes'],
   $generateTypePack: (types) => uleb128EncodeWithLen(Array.from(types, (type) => {
     var code = wasmTypeCodes[type];
 #if ASSERTIONS
@@ -46,10 +45,6 @@ addToLibrary({
 
 #if !WASM2JS || WASM == 2
   // Wraps a JS function as a wasm function with a given signature.
-  $convertJsFunctionToWasm__deps: [
-    '$uleb128EncodeWithLen',
-    '$generateTypePack'
-  ],
   $convertJsFunctionToWasm: (func, sig) => {
 #if ASSERTIONS && !WASM_BIGINT
     assert(!sig.includes('j'), 'i64 not permitted in function signatures when WASM_BIGINT is disabled');
@@ -93,7 +88,6 @@ addToLibrary({
   // Weak map of functions in the table to their indexes, created on first use.
   $functionsInTableMap: undefined,
 
-  $getEmptyTableSlot__deps: ['$freeTableIndexes', '$wasmTable'],
   $getEmptyTableSlot: () => {
     // Reuse a free index if there is one, otherwise grow.
     if (freeTableIndexes.length) {
@@ -114,7 +108,6 @@ addToLibrary({
 #endif
   },
 
-  $updateTableMap__deps: ['$getWasmTableEntry'],
   $updateTableMap: (offset, count) => {
     if (functionsInTableMap) {
       for (var i = offset; i < offset + count; i++) {
@@ -127,7 +120,6 @@ addToLibrary({
     }
   },
 
-  $getFunctionAddress__deps: ['$updateTableMap', '$functionsInTableMap', '$wasmTable'],
   $getFunctionAddress: (func) => {
     // First, create the map if this is the first use.
     if (!functionsInTableMap) {
@@ -142,16 +134,6 @@ addToLibrary({
    * 'sig' parameter is required if the function being added is a JS function.
    */
   $addFunction__docs: '/** @param {string=} sig */',
-  $addFunction__deps: ['$getFunctionAddress',
-                       '$functionsInTableMap', '$getEmptyTableSlot',
-                       '$setWasmTableEntry',
-#if !WASM2JS || WASM == 2
-                       '$convertJsFunctionToWasm',
-#endif
-#if ASSERTIONS >= 2
-                       '$getWasmTableEntry', '$wasmTable',
-#endif
-  ],
 
   $addFunction: (func, sig) => {
 #if ASSERTIONS
@@ -201,8 +183,6 @@ addToLibrary({
     return ret;
   },
 
-  $removeFunction__deps: ['$functionsInTableMap', '$freeTableIndexes',
-                          '$getWasmTableEntry', '$setWasmTableEntry'],
   $removeFunction: (index) => {
     functionsInTableMap.delete(getWasmTableEntry(index));
     setWasmTableEntry(index, null);

src/lib/libasync.js

@@ -21,10 +21,7 @@ addToLibrary({
 
 #if ASYNCIFY
   $Asyncify__force: true,
-  $Asyncify__deps: ['$runAndAbortIfError', '$callUserCallback',
-#if ASSERTIONS
-    '$createNamedFunction',
-#endif
+  $Asyncify__deps: [
 #if !MINIMAL_RUNTIME
     '$runtimeKeepalivePush', '$runtimeKeepalivePop',
 #endif
@@ -483,7 +480,7 @@ addToLibrary({
   emscripten_sleep__async: 'auto',
   emscripten_sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
 
-  emscripten_wget_data__deps: ['$asyncLoad', 'malloc'],
+  emscripten_wget_data__deps: ['malloc'],
   emscripten_wget_data__async: 'auto',
   emscripten_wget_data: async (url, pbuffer, pnum, perror) => {
     /* no need for run dependency, this is async but will not do any prepare etc. step */
@@ -500,7 +497,6 @@ addToLibrary({
     }
   },
 
-  emscripten_scan_registers__deps: ['$safeSetTimeout'],
   emscripten_scan_registers__async: true,
   emscripten_scan_registers: (func) => {
     return Asyncify.handleSleep((wakeUp) => {
@@ -517,7 +513,7 @@ addToLibrary({
     });
   },
 
-  $Fibers__deps: ['$Asyncify', 'emscripten_stack_set_limits', '$stackRestore'],
+  $Fibers__deps: ['emscripten_stack_set_limits'],
   $Fibers: {
     nextFiber: 0,
     trampolineRunning: false,
@@ -577,7 +573,6 @@ addToLibrary({
     },
   },
 
-  emscripten_fiber_swap__deps: ['$Asyncify', '$Fibers', '$stackSave'],
   emscripten_fiber_swap__async: true,
   emscripten_fiber_swap: (oldFiber, newFiber) => {
     if (ABORT) return;

src/lib/libatomic.js

@@ -94,7 +94,7 @@ addToLibrary({
   $liveAtomicWaitAsyncCounter: 0,
   $liveAtomicWaitAsyncCounter__internal: true,
 
-  emscripten_atomic_wait_async__deps: ['$atomicWaitStates', '$liveAtomicWaitAsyncs', '$liveAtomicWaitAsyncCounter', '$polyfillWaitAsync', '$callUserCallback'],
+  emscripten_atomic_wait_async__deps: ['$polyfillWaitAsync'],
   emscripten_atomic_wait_async: (addr, val, asyncWaitFinished, userData, maxWaitMilliseconds) => {
     let wait = Atomics.waitAsync(HEAP32, {{{ getHeapOffset('addr', 'i32') }}}, val, maxWaitMilliseconds);
     if (!wait.async) return atomicWaitStates.indexOf(wait.value);
@@ -116,7 +116,6 @@ addToLibrary({
     return -counter;
   },
 
-  emscripten_atomic_cancel_wait_async__deps: ['$liveAtomicWaitAsyncs'],
   emscripten_atomic_cancel_wait_async: (waitToken) => {
 #if ASSERTIONS
     if (waitToken == {{{ cDefs.ATOMICS_WAIT_NOT_EQUAL }}}) {
@@ -143,7 +142,6 @@ addToLibrary({
     return {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};
   },
 
-  emscripten_atomic_cancel_all_wait_asyncs__deps: ['$liveAtomicWaitAsyncs'],
   emscripten_atomic_cancel_all_wait_asyncs: () => {
     let waitAsyncs = Object.values(liveAtomicWaitAsyncs);
     for (var address of waitAsyncs) {
@@ -153,7 +151,6 @@ addToLibrary({
     return waitAsyncs.length;
   },
 
-  emscripten_atomic_cancel_all_wait_asyncs_at_address__deps: ['$liveAtomicWaitAsyncs'],
   emscripten_atomic_cancel_all_wait_asyncs_at_address: (address) => {
     let numCancelled = 0;
     for (var [waitToken, waitAddress] of Object.entries(liveAtomicWaitAsyncs)) {

src/lib/libautodebug.js

@@ -15,7 +15,6 @@ const LibraryAutodebug = {
     dbg('get_i32 ' + [loc, index, value]);
     return value;
   },
-  $get_i64__deps: ['setTempRet0'],
   $get_i64: (loc, index, low, high) => {
     dbg('get_i64 ' + [loc, index, low, high]);
     _setTempRet0(high);
@@ -49,7 +48,6 @@ const LibraryAutodebug = {
     dbg('set_i32 ' + [loc, index, value]);
     return value;
   },
-  $set_i64__deps: ['setTempRet0'],
   $set_i64: (loc, index, low, high) => {
     dbg('set_i64 ' + [loc, index, low, high]);
     _setTempRet0(high);
@@ -87,7 +85,6 @@ const LibraryAutodebug = {
     dbg('load_val_i32 ' + [loc, value]);
     return value;
   },
-  $load_val_i64__deps: ['setTempRet0'],
   $load_val_i64: (loc, low, high) => {
     dbg('load_val_i64 ' + [loc, low, high]);
     _setTempRet0(high);
@@ -109,7 +106,6 @@ const LibraryAutodebug = {
     dbg('store_val_i32 ' + [loc, value]);
     return value;
   },
-  $store_val_i64__deps: ['setTempRet0'],
   $store_val_i64: (loc, low, high) => {
     dbg('store_val_i64 ' + [loc, low, high]);
     _setTempRet0(high);

src/lib/libbrowser.js

@@ -7,14 +7,10 @@
 // Utilities for browser environments
 var LibraryBrowser = {
   $workerHandles__internal: true,
-  $workerHandles__deps: ['$HandleAllocator'],
   $workerHandles: 'new HandleAllocator();',
 
   $Browser__deps: [
-    '$getFullscreenElement',
 #if FILESYSTEM
-    '$preloadPlugins',
-    '$safeSetTimeout',
 #if MAIN_MODULE
     '$preloadedWasm',
 #endif
@@ -510,7 +506,7 @@ var LibraryBrowser = {
   $setCanvasSize: 'Browser.setCanvasSize',
   $createContext: 'Browser.createContext',
 
-  emscripten_run_preload_plugins__deps: ['$PATH'],
+  emscripten_run_preload_plugins__deps: ['$Browser'],
   emscripten_run_preload_plugins__proxy: 'sync',
   emscripten_run_preload_plugins: (file, onload, onerror) => {
     {{{ runtimeKeepalivePush() }}}
@@ -545,7 +541,6 @@ var LibraryBrowser = {
   $Browser_asyncPrepareDataCounter: 0,
 
   emscripten_run_preload_plugins_data__proxy: 'sync',
-  emscripten_run_preload_plugins_data__deps: ['$stringToNewUTF8', '$Browser_asyncPrepareDataCounter'],
   emscripten_run_preload_plugins_data: (data, size, suffix, arg, onload, onerror) => {
     {{{ runtimeKeepalivePush() }}}
 
@@ -570,14 +565,12 @@ var LibraryBrowser = {
   },
 
   // Callable from pthread, executes in pthread context.
-  emscripten_async_run_script__deps: ['emscripten_run_script', '$safeSetTimeout'],
   emscripten_async_run_script: (script, millis) => {
     // TODO: cache these to avoid generating garbage
     safeSetTimeout(() => _emscripten_run_script(script), millis);
   },
 
   // TODO: currently not callable from a pthread, but immediately calls onerror() if not on main thread.
-  emscripten_async_load_script__deps: ['$UTF8ToString', '$runDependencies', '$resolveRunDependencies', '$callUserCallback'],
   emscripten_async_load_script: async (url, onload, onerror) => {
     url = UTF8ToString(url);
 #if PTHREADS
@@ -627,6 +620,7 @@ var LibraryBrowser = {
     document.body.appendChild(script);
   },
 
+  emscripten_get_window_title__deps: ['malloc'],
   emscripten_get_window_title__proxy: 'sync',
   emscripten_get_window_title: () => {
     const buflen = 256;
@@ -675,7 +669,7 @@ var LibraryBrowser = {
 
   // To avoid creating worker parent->child chains, always proxies to execute on the main thread.
   emscripten_create_worker__proxy: 'sync',
-  emscripten_create_worker__deps: ['$UTF8ToString', 'realloc', '$workerHandles'],
+  emscripten_create_worker__deps: ['realloc'],
   emscripten_create_worker: (url) => {
     url = UTF8ToString(url);
     var worker = new Worker(url);
@@ -712,7 +706,7 @@ var LibraryBrowser = {
     return id;
   },
 
-  emscripten_destroy_worker__deps: ['free', '$workerHandles'],
+  emscripten_destroy_worker__deps: ['free'],
   emscripten_destroy_worker__proxy: 'sync',
   emscripten_destroy_worker: (id) => {
     var info = workerHandles.get(id);
@@ -721,7 +715,6 @@ var LibraryBrowser = {
     workerHandles.free(id);
   },
 
-  emscripten_call_worker__deps: ['$workerHandles'],
   emscripten_call_worker__proxy: 'sync',
   emscripten_call_worker: (id, funcName, data, size, callback, arg) => {
     funcName = UTF8ToString(funcName);
@@ -785,20 +778,18 @@ var LibraryBrowser = {
   },
 #endif
 
-  emscripten_get_worker_queue_size__deps: ['$workerHandles'],
   emscripten_get_worker_queue_size__proxy: 'sync',
   emscripten_get_worker_queue_size: (id) => {
     if (!workerHandles.has(id)) return -1;
     var info = workerHandles.get(id);
     return info.awaited;
   },
 
-  emscripten_get_preloaded_image_data__deps: ['$getPreloadedImageData', '$UTF8ToString'],
   emscripten_get_preloaded_image_data__proxy: 'sync',
   emscripten_get_preloaded_image_data: (path, w, h) => getPreloadedImageData(UTF8ToString(path), w, h),
 
   $getPreloadedImageData__internal: true,
-  $getPreloadedImageData__deps: ['$PATH_FS', 'malloc'],
+  $getPreloadedImageData__deps: ['malloc'],
   $getPreloadedImageData: (path, w, h) => {
     path = PATH_FS.resolve(path);
 
@@ -817,7 +808,7 @@ var LibraryBrowser = {
   },
 
 #if !WASMFS // WasmFS implements this in wasm
-  emscripten_get_preloaded_image_data_from_FILE__deps: ['$getPreloadedImageData', 'fileno'],
+  emscripten_get_preloaded_image_data_from_FILE__deps: ['fileno'],
   emscripten_get_preloaded_image_data_from_FILE__proxy: 'sync',
   emscripten_get_preloaded_image_data_from_FILE: (file, w, h) => {
     var fd = _fileno(file);
@@ -831,6 +822,4 @@ var LibraryBrowser = {
 #endif
 };
 
-autoAddDeps(LibraryBrowser, '$Browser');
-
 addToLibrary(LibraryBrowser);

src/lib/libc_preprocessor.js

@@ -35,7 +35,6 @@ addToLibrary({
   // Runs C preprocessor algorithm on the given string 'code'.
   // Supported preprocessor directives: #if, #ifdef, #ifndef, #else, #elif, #endif, #define and #undef.
   // predefs: Specifies a dictionary of { 'key1': function(arg0, arg1) {...}, 'key2': ... } of predefined preprocessing variables
-  $preprocess_c_code__deps: ['$find_closing_parens_index'],
   $preprocess_c_code: function(code, defs = {}) {
     var i = 0, // iterator over the input string
       len = code.length, // cache input length

src/lib/libccall.js

@@ -19,7 +19,6 @@ addToLibrary({
   },
 
   // C calling interface.
-  $ccall__deps: ['$getCFunc', '$writeArrayToMemory', '$stringToUTF8OnStack', '$stackSave', '$stackRestore', '$stackAlloc'],
   $ccall__docs: `
   /**
    * @param {string|null=} returnType
@@ -136,11 +135,6 @@ addToLibrary({
    * @param {Array=} argTypes
    * @param {Object=} opts
    */`,
-  $cwrap__deps: [ '$ccall',
-#if !ASSERTIONS
-    '$getCFunc',
-#endif
-  ],
   $cwrap: (ident, returnType, argTypes, opts) => {
 #if !ASSERTIONS
     // When the function takes numbers and returns a number, we can just return