Merge remote-tracking branch 'origin/main' into arsnyder16-fcoverage

Author: arsnyder16

ChangeLog.md

@@ -43,6 +43,7 @@ See docs/process.md for more on how version tagging works.
   example, `-sEXPORTED_RUNTIME_METHODS=HEAP8,HEAPU32` (if you need `HEAP8` and
   `HEAPU32`). (#24079)
 - libjpeg port updated from 9c to 9f. (#24085)
+- Missing exports in EXPORTED_RUNTIME_METHODS will now error instead of warn.
 
 4.0.6 - 03/26/25
 ----------------

emcc.py

@@ -526,7 +526,7 @@ def run(args):
     args += shlex.split(EMCC_CFLAGS)
 
   if DEBUG:
-    logger.warning(f'invocation: {shared.shlex_join(args)} (in {os.getcwd()})')
+    logger.warning(f'invocation: {shlex.join(args)} (in {os.getcwd()})')
 
   # Strip args[0] (program name)
   args = args[1:]
@@ -596,7 +596,7 @@ def run(args):
         exit_with_error(f'unable to parse output of `{cmd}`:\n{proc.stderr}')
       parts = shlex.split(lines[0].replace('\\', '\\\\'))
       parts = [x for x in parts if x not in ['-c', '-o', '-v', '-emit-llvm'] and input_file not in x and temp_target not in x]
-      print(shared.shlex_join(parts[1:]))
+      print(shlex.join(parts[1:]))
     return 0
 
   if '-dumpmachine' in args or '-print-target-triple' in args or '--print-target-triple' in args:

emcmake.py

@@ -5,6 +5,7 @@
 # found in the LICENSE file.
 
 import os
+import shlex
 import shutil
 import sys
 from tools import shared
@@ -56,7 +57,7 @@ def has_substr(args, substr):
       print('emcmake: no compatible cmake generator found; Please install ninja or mingw32-make, or specify a generator explicitly using -G', file=sys.stderr)
       return 1
 
-  print('configure: ' + shared.shlex_join(args), file=sys.stderr)
+  print(f'configure: {shlex.join(args)}', file=sys.stderr)
   try:
     shared.check_call(args)
     return 0

emconfigure.py

@@ -16,6 +16,7 @@
 tests will work properly.
 """
 
+import shlex
 import sys
 from tools import building
 from tools import shared
@@ -47,7 +48,7 @@ def run():
   # compilation with emcc, but instead do builds natively with Clang. This
   # is a heuristic emulation that may or may not work.
   env['EMMAKEN_JUST_CONFIGURE'] = '1'
-  print('configure: ' + shared.shlex_join(args), file=sys.stderr)
+  print(f'configure: {shlex.join(args)}', file=sys.stderr)
   try:
     shared.check_call(args, env=env)
     return 0

src/lib/libegl.js

@@ -507,6 +507,8 @@ var LibraryEGL = {
   eglGetError: () => EGL.errorCode,
 
   // EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
+  // The allocated strings are cached and never freed.
+  eglQueryString__noleakcheck: true,
   eglQueryString__deps: ['$stringToNewUTF8'],
   eglQueryString__proxy: 'sync',
   eglQueryString: (display, name) => {

src/lib/libfs.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-addToLibrary({
+var LibraryFS = {
   $FS__deps: ['$randomFill', '$PATH', '$PATH_FS', '$TTY', '$MEMFS',
     '$FS_createPreloadedFile',
     '$FS_modeStringToFlags',
@@ -38,9 +38,7 @@ addToLibrary({
     addAtExit('FS.quit();');
     return `
 FS.createPreloadedFile = FS_createPreloadedFile;
-FS.staticInit();
-// Set module methods based on EXPORTED_RUNTIME_METHODS
-{{{ EXPORTED_RUNTIME_METHODS.filter((func) => func.startsWith('FS_')).map((func) => "Module['" + func + "'] = FS." + func.slice(3) + ";\n").reduce((str, func) => str + func, '') }}}`;
+FS.staticInit();`;
   },
   $FS: {
     root: null,
@@ -1917,22 +1915,23 @@ FS.staticInit();
 #endif
   },
 
-  $FS_createDataFile__deps: ['$FS'],
-  $FS_createDataFile: (parent, name, fileData, canRead, canWrite, canOwn) => {
-    FS.createDataFile(parent, name, fileData, canRead, canWrite, canOwn);
-  },
-
-  $FS_unlink__deps: ['$FS'],
-  $FS_unlink: (path) => FS.unlink(path),
-
   $FS_mkdirTree__docs: `
   /**
    * @param {number=} mode Optionally, the mode to create in. Uses mkdir's
    *                       default if not set.
    */`,
-  $FS_mkdirTree__deps: ['$FS'],
-  $FS_mkdirTree: (path, mode) => FS.mkdirTree(path, mode),
-
-  $FS_createLazyFile__deps: ['$FS'],
-  $FS_createLazyFile: 'FS.createLazyFile',
-});
+   $FS_mkdirTree__deps: ['$FS'],
+   $FS_mkdirTree: (path, mode) => FS.mkdirTree(path, mode),
+};
+
+// Add library aliases for all the FS.<symbol> as FS_<symbol>.
+for (let key in LibraryFS.$FS) {
+  const alias = `$FS_${key}`;
+  // Skip defining the alias if it already exists or if it's not an API function.
+  if (LibraryFS[alias] || key[0] !== key[0].toLowerCase()) {
+    continue;
+  }
+  LibraryFS[alias] = `(...args) => FS.${key}(...args)`;
+  LibraryFS[`${alias}__deps`] = ['$FS'];
+}
+addToLibrary(LibraryFS);

src/lib/libhtml5.js

@@ -249,6 +249,7 @@ var LibraryHTML5 = {
     },
   },
 
+  $registerKeyEventCallback__noleakcheck: true,
   $registerKeyEventCallback__deps: ['$JSEvents', '$findEventTarget', '$stringToUTF8', 'malloc'],
   $registerKeyEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -477,6 +478,7 @@ var LibraryHTML5 = {
     HEAP32[idx + {{{ C_STRUCTS.EmscriptenMouseEvent.targetY / 4 }}}] = e.clientY - (rect.top  | 0);
   },
 
+  $registerMouseEventCallback__noleakcheck: true,
   $registerMouseEventCallback__deps: ['$JSEvents', '$fillMouseEventData', '$findEventTarget', 'malloc'],
   $registerMouseEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -568,6 +570,7 @@ var LibraryHTML5 = {
     return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
   },
 
+  $registerWheelEventCallback__noleakcheck: true,
   $registerWheelEventCallback__deps: ['$JSEvents', '$fillMouseEventData', 'malloc'],
   $registerWheelEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -619,6 +622,7 @@ var LibraryHTML5 = {
     }
   },
 
+  $registerUiEventCallback__noleakcheck: true,
   $registerUiEventCallback__deps: ['$JSEvents', '$findEventTarget', 'malloc'],
   $registerUiEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -691,6 +695,7 @@ var LibraryHTML5 = {
   emscripten_set_scroll_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) =>
     registerUiEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_SCROLL }}}, "scroll", targetThread),
 
+  $registerFocusEventCallback__noleakcheck: true,
   $registerFocusEventCallback__deps: ['$JSEvents', '$findEventTarget', 'malloc', '$stringToUTF8'],
   $registerFocusEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -754,6 +759,7 @@ var LibraryHTML5 = {
     {{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenDeviceOrientationEvent.absolute, 'e.absolute', 'i8') }}};
   },
 
+  $registerDeviceOrientationEventCallback__noleakcheck: true,
   $registerDeviceOrientationEventCallback__deps: ['$JSEvents', '$fillDeviceOrientationEventData', '$findEventTarget'],
   $registerDeviceOrientationEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -823,6 +829,7 @@ var LibraryHTML5 = {
     {{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenDeviceMotionEvent.rotationRateGamma, 'rr["gamma"]', 'double') }}};
   },
 
+  $registerDeviceMotionEventCallback__noleakcheck: true,
   $registerDeviceMotionEventCallback__deps: ['$JSEvents', '$fillDeviceMotionEventData', '$findEventTarget', 'malloc'],
   $registerDeviceMotionEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -905,6 +912,7 @@ var LibraryHTML5 = {
     {{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenOrientationChangeEvent.orientationAngle, 'orientationAngle', 'i32') }}};
   },
 
+  $registerOrientationChangeEventCallback__noleakcheck: true,
   $registerOrientationChangeEventCallback__deps: ['$JSEvents', '$fillOrientationChangeEventData', 'malloc'],
   $registerOrientationChangeEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -1017,6 +1025,7 @@ var LibraryHTML5 = {
     }
   },
 
+  $registerFullscreenChangeEventCallback__noleakcheck: true,
   $registerFullscreenChangeEventCallback__deps: ['$JSEvents', '$fillFullscreenChangeEventData', 'malloc'],
   $registerFullscreenChangeEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -1556,6 +1565,7 @@ var LibraryHTML5 = {
     stringToUTF8(id, eventStruct + {{{ C_STRUCTS.EmscriptenPointerlockChangeEvent.id }}}, {{{ cDefs.EM_HTML5_LONG_STRING_LEN_BYTES }}});
   },
 
+  $registerPointerlockChangeEventCallback__noleakcheck: true,
   $registerPointerlockChangeEventCallback__deps: ['$JSEvents', '$fillPointerlockChangeEventData', 'malloc'],
   $registerPointerlockChangeEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -1785,6 +1795,7 @@ var LibraryHTML5 = {
     {{{ makeSetValue('eventStruct', C_STRUCTS.EmscriptenVisibilityChangeEvent.visibilityState, 'visibilityState', 'i32') }}};
   },
 
+  $registerVisibilityChangeEventCallback__noleakcheck: true,
   $registerVisibilityChangeEventCallback__deps: ['$JSEvents', '$fillVisibilityChangeEventData', 'malloc'],
   $registerVisibilityChangeEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -1839,6 +1850,7 @@ var LibraryHTML5 = {
     return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
   },
 
+  $registerTouchEventCallback__noleakcheck: true,
   $registerTouchEventCallback__deps: ['$JSEvents', '$findEventTarget', '$getBoundingClientRect', 'malloc'],
   $registerTouchEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -1987,6 +1999,7 @@ var LibraryHTML5 = {
     stringToUTF8(e.mapping, eventStruct + {{{ C_STRUCTS.EmscriptenGamepadEvent.mapping }}}, {{{ cDefs.EM_HTML5_MEDIUM_STRING_LEN_BYTES }}});
   },
 
+  $registerGamepadEventCallback__noleakcheck: true,
   $registerGamepadEventCallback__deps: ['$JSEvents', '$fillGamepadEventData', '$findEventTarget', 'malloc'],
   $registerGamepadEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS
@@ -2127,6 +2140,7 @@ var LibraryHTML5 = {
 
   $battery: () => navigator.battery || navigator.mozBattery || navigator.webkitBattery,
 
+  $registerBatteryEventCallback__noleakcheck: true,
   $registerBatteryEventCallback__deps: ['$JSEvents', '$fillBatteryEventData', '$battery', '$findEventTarget', 'malloc'],
   $registerBatteryEventCallback: (target, userData, useCapture, callbackfunc, eventTypeId, eventTypeString, targetThread) => {
 #if PTHREADS

src/lib/libwebgl.js

@@ -1287,6 +1287,8 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
     GLctx.pixelStorei(pname, param);
   },
 
+  // The allocated strings are cached and never freed.
+  glGetString__noleakcheck: true,
   glGetString__deps: ['$stringToNewUTF8', '$webglGetExtensions'],
   glGetString: (name_) => {
     var ret = GL.stringCache[name_];

src/modules.mjs

@@ -13,7 +13,6 @@ import {
   isJsOnlySymbol,
   error,
   readFile,
-  warn,
   pushCurrentFile,
   popCurrentFile,
   printErr,
@@ -512,11 +511,11 @@ function exportRuntimeSymbols() {
     }
   }
 
-  // check all exported things exist, warn about typos
+  // check all exported things exist, error when missing
   runtimeElementsSet = new Set(runtimeElements);
   for (const name of EXPORTED_RUNTIME_METHODS) {
     if (!runtimeElementsSet.has(name)) {
-      warn(`invalid item in EXPORTED_RUNTIME_METHODS: ${name}`);
+      error(`undefined exported symbol: "${name}" in EXPORTED_RUNTIME_METHODS`);
     }
   }
 

system/lib/libc/musl/src/fcntl/fcntl.c

@@ -3,22 +3,28 @@
 #include <stdarg.h>
 #include <errno.h>
 #include "syscall.h"
+#include <emscripten/console.h>
 
-#ifdef __EMSCRIPTEN__
-__attribute__((no_sanitize("address")))
-#endif
 int fcntl(int fd, int cmd, ...)
 {
-	unsigned long arg;
+#ifdef __EMSCRIPTEN__
 	// XXX Emscripten: According to the va_arg man page it is undefined behaviour to
 	// read arguments that are not passed.  This can lead to a false positive
 	// in SAFE_HEAP, so avoid it.
+	unsigned long arg = 0;
 	if (cmd != F_GETFL && cmd != F_GETFD && cmd != F_GETOWN) {
 		va_list ap;
 		va_start(ap, cmd);
 		arg = va_arg(ap, unsigned long);
 		va_end(ap);
 	}
+#else
+	unsigned long arg;
+	va_list ap;
+	va_start(ap, cmd);
+	arg = va_arg(ap, unsigned long);
+	va_end(ap);
+#endif
 	if (cmd == F_SETFL) arg |= O_LARGEFILE;
 	if (cmd == F_SETLKW) return syscall_cp(SYS_fcntl, fd, cmd, (void *)arg);
 	if (cmd == F_GETOWN) {

system/lib/libcxx/include/__config_site

@@ -6,5 +6,5 @@
 #define _LIBCPP_ABI_NAMESPACE __2
 // Emscripten doesn't use PSTL at the moment.
 #define _LIBCPP_PSTL_BACKEND_SERIAL
-#define _LIBCPP_HARDENING_MODE _LIBCPP_HARDENING_MODE_NONE
+#define _LIBCPP_HARDENING_MODE_DEFAULT _LIBCPP_HARDENING_MODE_NONE
 #define _LIBCPP_HAS_NO_TIME_ZONE_DATABASE

test/common.py

@@ -88,7 +88,7 @@
 EMCMAKE = shared.bat_suffix(path_from_root('emcmake'))
 EMCONFIGURE = shared.bat_suffix(path_from_root('emconfigure'))
 EMRUN = shared.bat_suffix(shared.path_from_root('emrun'))
-WASM_DIS = Path(building.get_binaryen_bin(), 'wasm-dis')
+WASM_DIS = os.path.join(building.get_binaryen_bin(), 'wasm-dis')
 LLVM_OBJDUMP = os.path.expanduser(shared.build_llvm_tool_path(shared.exe_suffix('llvm-objdump')))
 PYTHON = sys.executable
 if not config.NODE_JS_TEST:
@@ -1406,7 +1406,7 @@ def build(self, filename, libraries=None, includes=None, force_c=False, emcc_arg
       output = output_basename + output_suffix
     else:
       output = shared.unsuffixed_basename(filename) + output_suffix
-    cmd = compiler + [filename, '-o', output] + all_emcc_args
+    cmd = compiler + [str(filename), '-o', output] + all_emcc_args
     if libraries:
       cmd += libraries
     if includes:
@@ -1755,7 +1755,7 @@ def run_process(self, cmd, check=True, **args):
       if check and e.returncode != 0:
         print(e.stdout)
         print(e.stderr)
-        self.fail(f'subprocess exited with non-zero return code({e.returncode}): `{shared.shlex_join(cmd)}`')
+        self.fail(f'subprocess exited with non-zero return code({e.returncode}): `{shlex.join(cmd)}`')
 
   def emcc(self, filename, args=[], output_filename=None, **kwargs):  # noqa
     compile_only = '-c' in args or '-sSIDE_MODULE' in args

test/jsrun.py

@@ -6,6 +6,7 @@
 import common
 import logging
 import os
+import shlex
 import subprocess
 import sys
 from subprocess import PIPE, CalledProcessError
@@ -97,7 +98,7 @@ def run_js(filename, engine, args=None,
 
   command = make_command(os.path.abspath(filename), engine, args)
   if common.EMTEST_VERBOSE:
-    print(f"Running: '{shared.shlex_join(command)}'")
+    print(f"Running: '{shlex.join(command)}'")
   try:
     proc = subprocess.run(
         command,

test/other/codesize/test_codesize_hello_O0.gzsize

@@ -1 +1 @@
-7785
+8292

test/other/codesize/test_codesize_hello_O0.jssize

@@ -1 +1 @@
-20761
+22165

test/other/codesize/test_codesize_minimal_O0.gzsize

@@ -1 +1 @@
-6099
+6595

test/other/codesize/test_codesize_minimal_O0.jssize

@@ -1 +1 @@
-16143
+17534

test/other/embind_tsgen_ignore_1.d.ts

@@ -1,11 +1,11 @@
 // TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
 declare namespace RuntimeExports {
-    let FS_createPath: any;
-    function FS_createDataFile(parent: any, name: any, fileData: any, canRead: any, canWrite: any, canOwn: any): void;
+    function FS_createPath(...args: any[]): any;
+    function FS_createDataFile(...args: any[]): any;
     function FS_createPreloadedFile(parent: any, name: any, url: any, canRead: any, canWrite: any, onload: any, onerror: any, dontCreateFile: any, canOwn: any, preFinish: any): void;
-    function FS_unlink(path: any): any;
-    let FS_createLazyFile: any;
-    let FS_createDevice: any;
+    function FS_unlink(...args: any[]): any;
+    function FS_createLazyFile(...args: any[]): any;
+    function FS_createDevice(...args: any[]): any;
     let addRunDependency: any;
     let removeRunDependency: any;
 }

test/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-51593
+53547

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-49661
+51597