Merge branch 'main' into glut-window-resize

Author: kripken

.circleci/config.yml

@@ -38,10 +38,12 @@ commands:
           command: |
             # TODO: Make these part of the base image
             apt-get install -q -y libu2f-udev libvulkan1 xdg-utils
-            # wget -O ~/chrome.deb https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb
+            # TODO: Switch by to unstable once
+            # https://github.com/emscripten-core/emscripten/issues/24780 os
+            # resolved
+            wget -O ~/chrome.deb https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb
             # If that download link breaks, temporarily use this URL instead:
             # wget -O ~/chrome.deb https://storage.googleapis.com/webassembly/chrome/google-chrome-stable_current_amd64.deb
-            wget -O ~/chrome.deb https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb
             dpkg -i ~/chrome.deb
   emsdk-env:
     description: "emsdk_env.sh"
@@ -317,7 +319,7 @@ commands:
             EMTEST_DETECT_TEMPFILE_LEAKS: "0"
             # --no-sandbox because we are running as root and chrome requires
             # this flag for now: https://crbug.com/638180
-            CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile --enable-experimental-web-platform-features --enable-features=JavaScriptSourcePhaseImports"
+            CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --enable-unsafe-swiftshader --use-gl=swiftshader  --user-data-dir=/tmp/chrome-emscripten-profile --enable-experimental-web-platform-features --enable-features=JavaScriptSourcePhaseImports"
             # Increase the window size to avoid flaky sdl tests see #24236.
             CHROME_FLAGS_HEADLESS: "--headless=new --window-size=1024,768 --remote-debugging-port=1234"
             CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-stack-switching --experimental-wasm-type-reflection --experimental-wasm-rab-integration\""

.github/workflows/ci.yml

@@ -61,8 +61,9 @@ jobs:
           echo "Checking out ${{ github.base_ref }}"
           git checkout ${{ github.base_ref }}
           git rev-parse HEAD
-          # Hack to honor changes to rebaseline_tests.py in the current PR
-          git checkout - ./tools/maint/rebaseline_tests.py
+          # Uncomment this like to pull the rebaseline_tests.py from the
+          # current branch:
+          # git checkout - ./tools/maint/rebaseline_tests.py
           ./bootstrap
           if ! ./tools/maint/rebaseline_tests.py --check-only; then
             echo "Test expectations are out-of-date on the target branch."

ChangeLog.md

@@ -20,6 +20,10 @@ See docs/process.md for more on how version tagging works.
 
 4.0.12 (in development)
 -----------------------
+- libcxx, libcxxabi, libunwind, and compiler-rt were updated to LLVM 20.1.8.
+  (#24757)
+- The `fsblkcnt_t` and `fsfilcnt_t` types used by `statfs`/`statvfs` were
+  changed from 32-bit to 64-bit. (#24769)
 - Support for `-sTEXT_DECODER=0` was removed, due to widespread support for
   `TextDecoder`.  The remaining valid values for this setting are `=1`
   (conditional use of `TextDecoder` with fallback) and `=2` (unconditional use

site/source/docs/api_reference/emscripten.h.rst

@@ -399,7 +399,7 @@ Functions
 
 
   .. note::
-    - Main loop blockers block the main loop from running, and can be counted to show progress. In contrast, ``emscripten_async_calls`` are not counted, do not block the main loop, and can fire at specific time in the future.
+    - Main loop blockers block the main loop from running, and can be counted to show progress. In contrast, :c:func:`emscripten_async_call` is not counted, does not block the main loop, and can fire at a specific time in the future.
 
   :param em_arg_callback_func func: The main loop blocker function. The function signature must have a ``void*`` parameter for passing the ``arg`` value.
   :param void* arg: User-defined arguments to pass to the blocker function.

src/lib/libnoderawfs.js

@@ -84,11 +84,18 @@ addToLibrary({
       var stream = FS.getStreamChecked(fd);
       return fs.fstatSync(stream.nfd);
     },
-    statfsStream(stream) {
-      return fs.statfsSync(stream.path);
+    statfs(path) {
+      // Node's fs.statfsSync API doesn't provide these attributes so include
+      // some defaults.
+      var defaults = {
+        fsid: 42,
+        flags: 2,
+        namelen: 255,
+      }
+      return Object.assign(defaults, fs.statfsSync(path));
     },
-    statfsNode(node) {
-      return fs.statfsSync(node.path);
+    statfsStream(stream) {
+      return FS.statfs(stream.path);
     },
     chmod(path, mode, dontFollow) {
       mode &= {{{ cDefs.S_IALLUGO }}};
@@ -166,7 +173,8 @@ addToLibrary({
     },
     close(stream) {
       VFS.closeStream(stream.fd);
-      if (!stream.stream_ops && --stream.shared.refcnt <= 0) {
+      // Don't close stdin/stdout/stderr since they are used by node itself.
+      if (!stream.stream_ops && --stream.shared.refcnt <= 0 && stream.nfd > 2) {
         // This stream is created by our Node.js filesystem, close the
         // native file descriptor when its reference count drops to 0.
         fs.closeSync(stream.nfd);

src/lib/libsyscall.js

@@ -66,11 +66,11 @@ var SyscallsLibrary = {
     writeStatFs(buf, stats) {
       {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bsize, 'stats.bsize', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.statfs.f_frsize, 'stats.bsize', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, 'stats.blocks', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, 'stats.bfree', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, 'stats.bavail', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'stats.files', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, 'stats.ffree', 'i32') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, 'stats.blocks', 'i64') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, 'stats.bfree', 'i64') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, 'stats.bavail', 'i64') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'stats.files', 'i64') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, 'stats.ffree', 'i64') }}};
       {{{ makeSetValue('buf', C_STRUCTS.statfs.f_fsid, 'stats.fsid', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.statfs.f_flags, 'stats.flags', 'i32') }}};  // ST_NOSUID
       {{{ makeSetValue('buf', C_STRUCTS.statfs.f_namelen, 'stats.namelen', 'i32') }}};

src/lib/libwebgl.js

@@ -663,12 +663,24 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
       var contextHandle = glCtx.canvas.GLctxObject.handle;
       glCtx[f] = function(...args) {
         var ret = orig.apply(this, args);
-        // Some GL functions take a view of the entire linear memory.  Replace
-        // such arguments with the string 'HEAP' to avoid serializing all of
-        // memory.
         for (var i in args) {
-          if (ArrayBuffer.isView(args[i]) && args[i].byteLength === HEAPU8.byteLength) {
-            args[i] = 'HEAP';
+          if (ArrayBuffer.isView(args[i])) {
+            // Some GL functions take a view of the entire linear memory.  Replace
+            // such arguments with the string 'HEAP' to avoid serializing all of
+            // memory.
+            if (args[i].byteLength === HEAPU8.byteLength) {
+              args[i] = 'HEAP';
+              continue;
+            }
+            // For large arrays just take the first N elements.
+            const MAX_ARRAY_ELEMS = 30;
+            if (args[i].length > MAX_ARRAY_ELEMS) {
+              const notShown = args[i].length - MAX_ARRAY_ELEMS;
+              args[i] = args[i].subarray(0, MAX_ARRAY_ELEMS);
+              args[i] = `[${args[i]}, ... <${notShown} more elements not shown>]`;
+            } else {
+              args[i] = `[${args[i]}]`;
+            }
           }
         }
 #if PTHREADS

src/postamble_minimal.js

@@ -108,13 +108,17 @@ var imports = {
 
 #if MINIMAL_RUNTIME_STREAMING_WASM_INSTANTIATION
 // https://caniuse.com/#feat=wasm and https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiateStreaming
-#if MIN_FIREFOX_VERSION < 58 || MIN_CHROME_VERSION < 61 || MIN_NODE_VERSION < 180100 || MIN_SAFARI_VERSION < 150000
+#if MIN_FIREFOX_VERSION < 58 || MIN_CHROME_VERSION < 61 || MIN_SAFARI_VERSION < 150000 || ENVIRONMENT_MAY_BE_NODE
 #if ASSERTIONS && !WASM2JS
 // Module['wasm'] should contain a typed array of the Wasm object data, or a
 // precompiled WebAssembly Module.
 assert(WebAssembly.instantiateStreaming || Module['wasm'], 'Must load WebAssembly Module in to variable Module.wasm before adding compiled output .js script to the DOM');
 #endif
 (WebAssembly.instantiateStreaming
+#if ENVIRONMENT_MAY_BE_NODE
+  // Node's fetch API cannot be used for local files, so we cannot use instantiateStreaming
+  && !ENVIRONMENT_IS_NODE
+#endif
   ? WebAssembly.instantiateStreaming(fetch('{{{ TARGET_BASENAME }}}.wasm'), imports)
   : WebAssembly.instantiate(Module['wasm'], imports)).then((output) => {
 #else
@@ -221,13 +225,12 @@ WebAssembly.instantiate(Module['wasm'], imports).then((output) => {
 #endif
 }
 
-#if ASSERTIONS || WASM == 2
+#if WASM == 2
 , (error) => {
 #if ASSERTIONS
   console.error(error);
 #endif
 
-#if WASM == 2
 #if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
   if (typeof location != 'undefined') {
 #endif
@@ -239,9 +242,8 @@ WebAssembly.instantiate(Module['wasm'], imports).then((output) => {
 #if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
   }
 #endif
-#endif // WASM == 2
 }
-#endif // ASSERTIONS || WASM == 2
+#endif // WASM == 2
 );
 
 #if PTHREADS || WASM_WORKERS

src/postamble_modularize.js

@@ -4,8 +4,6 @@
 // We assign to the `moduleRtn` global here and configure closure to see
 // this as and extern so it won't get minified.
 
-#if WASM_ASYNC_COMPILATION
-
 #if USE_READY_PROMISE
 if (runtimeInitialized)  {
   moduleRtn = Module;
@@ -20,12 +18,6 @@ if (runtimeInitialized)  {
 moduleRtn = {};
 #endif
 
-#else  // WASM_ASYNC_COMPILATION
-
-moduleRtn = Module;
-
-#endif // WASM_ASYNC_COMPILATION
-
 #if ASSERTIONS
 // Assertion for attempting to access module properties on the incoming
 // moduleArg.  In the past we used this object as the prototype of the module

src/preamble.js

@@ -692,7 +692,11 @@ async function instantiateArrayBuffer(binaryFile, imports) {
 
 async function instantiateAsync(binary, binaryFile, imports) {
 #if !SINGLE_FILE
-  if (!binary && typeof WebAssembly.instantiateStreaming == 'function'
+  if (!binary
+#if MIN_FIREFOX_VERSION < 58 || MIN_CHROME_VERSION < 61 || MIN_SAFARI_VERSION < 150000
+      // See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiateStreaming
+      && WebAssembly.instantiateStreaming
+#endif
 #if ENVIRONMENT_MAY_BE_WEBVIEW
       // Don't use streaming for file:// delivered objects in a webview, fetch them synchronously.
       && !isFileURI(binaryFile)