Merge branch 'main' into arsnyder16-fcoverage

Author: arsnyder16

.circleci/config.yml

@@ -546,7 +546,6 @@ jobs:
             asan.test_dlfcn_basic
             asan.test_async_hello_jspi
             asan.test_cubescript
-            asan.test_wasm_worker_hello
             asan.test_externref_emjs_dynlink
             asan.test_asyncify_longjmp
             asan.test_pthread_run_on_main_thread

site/source/docs/api_reference/wasm_audio_worklets.rst

@@ -165,7 +165,7 @@ which resumes the audio context when the user clicks on the DOM Canvas element t
     return true; // Keep the graph output going
   }
 
-And that's it! Compile the code with the linker flags ``-sAUDIO_WORKLET=1 -sWASM_WORKERS=1`` to enable targeting AudioWorklets.
+And that's it! Compile the code with the linker flags ``-sAUDIO_WORKLET -sWASM_WORKERS`` to enable targeting AudioWorklets.
 
 Synchronizing audio thread with the main thread
 ===============================================

site/source/docs/tools_reference/settings_reference.rst

@@ -4,13 +4,13 @@
 Emscripten Compiler Settings
 ============================
 
-The following is a complete list of settings that can be passed
-to emscripten via ``-s`` on the command line.  For example
-``-sASSERTIONS`` or ``-sASSERTIONS=0``.  For more details see the
-:ref:`emcc <emcc-s-option-value>` documentation.
+The following is a complete list of settings that can be passed to emscripten
+via ``-s`` on the command line.  For example ``-sASSERTIONS`` or
+``-sASSERTIONS=0``.  For more details see the :ref:`emcc <emcc-s-option-value>`
+documentation.
 
-Unless otherwise noted these settings only apply when linking
-and have no effect during compilation.
+Unless otherwise noted these settings only apply when linking and have no effect
+during compilation.
 
 .. Auto-generated by update_settings_docs.py. **DO NOT EDIT**
 
@@ -467,9 +467,8 @@ sent value to memory and loaded the received type from the same memory (using
 truncs/extends/ reinterprets). This means that when types do not match the
 emulated values may not match (this is true of native too, for that matter -
 this is all undefined behavior). This approaches appears good enough to
-support Python, which is the main use case motivating this feature.
-
-.. note:: This setting is deprecated
+support Python (the original motiviation for this feature) and Glib (the
+continued motivation).
 
 Default value: false
 
@@ -3355,3 +3354,17 @@ Experimental support for wasm ESM integration.
 Requires EXPORT_ES6 and MODULARIZE=instance
 
 Default value: false
+
+.. _js_base64_api:
+
+JS_BASE64_API
+=============
+
+Enable use of the JS arraybuffer-base64 API:
+https://github.com/tc39/proposal-arraybuffer-base64
+To run the resulting code currently requires passing `--js_base_64` to node
+or chrome.
+
+.. note:: This is an experimental setting
+
+Default value: false

src/audio_worklet.js

@@ -1,5 +1,5 @@
 // This file is the main bootstrap script for Wasm Audio Worklets loaded in an
-// Emscripten application.  Build with -sAUDIO_WORKLET=1 linker flag to enable
+// Emscripten application.  Build with -sAUDIO_WORKLET linker flag to enable
 // targeting Audio Worklets.
 
 // AudioWorkletGlobalScope does not have a onmessage/postMessage() functionality

src/lib/libbase64.js

@@ -22,6 +22,9 @@ addToLibrary({
 `,
   $base64Decode__docs: '/** @noinline */',
   $base64Decode: (b64) => {
+#if JS_BASE64_API
+    return Uint8Array.fromBase64(b64);
+#else
 #if ENVIRONMENT_MAY_BE_NODE
     if (ENVIRONMENT_IS_NODE) {
       var buf = Buffer.from(b64, 'base64');
@@ -42,5 +45,6 @@ addToLibrary({
       output[j+2] = b2 << 6 | base64ReverseLookup[b64.charCodeAt(i+3)];
     }
     return output;
+#endif
   },
 });

src/lib/libpthread.js

@@ -96,16 +96,16 @@ var LibraryPThread = {
         ) {
           t = _pthread_self();
         }
-        return `w:${workerID},t:${ptrToString(t)}: `;
+        return `w:${workerID},t:${ptrToString(t)}:`;
       }
 
       // Prefix all err()/dbg() messages with the calling thread ID.
       var origDbg = dbg;
-      dbg = (...args) => origDbg(pthreadLogPrefix() + args.join(' '));
+      dbg = (...args) => origDbg(pthreadLogPrefix(), ...args);
 #if PTHREADS_DEBUG
       // With PTHREADS_DEBUG also prefix all err() messages.
       var origErr = err;
-      err = (...args) => origErr(pthreadLogPrefix() + args.join(' '));
+      err = (...args) => origErr(pthreadLogPrefix(), ...args);
 #endif
     },
 #endif

src/lib/libwasm_worker.js

@@ -204,12 +204,6 @@ if (ENVIRONMENT_IS_WASM_WORKER
 #endif
       'sb': stackLowestAddress, // sb = stack bottom (lowest stack address, SP points at this when stack is full)
       'sz': stackSize,          // sz = stack size
-#if USE_OFFSET_CONVERTER
-      'wasmOffsetData': wasmOffsetConverter,
-#endif
-#if LOAD_SOURCE_MAP
-      'wasmSourceMapData': wasmSourceMap,
-#endif
     });
     worker.onmessage = _wasmWorkerRunPostMessage;
 #if ENVIRONMENT_MAY_BE_NODE

src/settings.js

@@ -342,9 +342,9 @@ var SAFE_HEAP_LOG = false;
 // truncs/extends/ reinterprets). This means that when types do not match the
 // emulated values may not match (this is true of native too, for that matter -
 // this is all undefined behavior). This approaches appears good enough to
-// support Python, which is the main use case motivating this feature.
+// support Python (the original motiviation for this feature) and Glib (the
+// continued motivation).
 // [link]
-// [deprecated]
 var EMULATE_FUNCTION_POINTER_CASTS = false;
 
 // Print out exceptions in emscriptened code.
@@ -2193,6 +2193,14 @@ var SOURCE_PHASE_IMPORTS = false;
 // [link]
 var WASM_ESM_INTEGRATION = false;
 
+// Enable use of the JS arraybuffer-base64 API:
+// https://github.com/tc39/proposal-arraybuffer-base64
+// To run the resulting code currently requires passing `--js_base_64` to node
+// or chrome.
+// [experimental]
+// [link]
+var JS_BASE64_API = false;
+
 // For renamed settings the format is:
 // [OLD_NAME, NEW_NAME]
 // For removed settings (which now effectively have a fixed value and can no

src/settings_internal.js

@@ -137,9 +137,6 @@ var WASM_BINARY_FILE = '';
 // name of the file containing the Wasm Worker *.ww.js, if relevant
 var WASM_WORKER_FILE = '';
 
-// name of the file containing the Audio Worklet *.aw.js, if relevant
-var AUDIO_WORKLET_FILE = '';
-
 // Base URL the source mapfile, if relevant
 var SOURCE_MAP_BASE = '';
 

test/test_core.py

@@ -886,6 +886,7 @@ def test_longjmp_standalone(self):
   def test_longjmp(self):
     self.do_core_test('test_longjmp.c')
 
+  @no_asan('ASan does not support WASM_WORKERS')
   def test_longjmp_wasm_workers(self):
     self.do_core_test('test_longjmp.c', emcc_args=['-sWASM_WORKERS'])
 
@@ -9592,14 +9593,17 @@ def test_emscripten_async_load_script(self):
     self.do_runf('test_emscripten_async_load_script.c', emcc_args=['-sFORCE_FILESYSTEM'])
 
   @node_pthreads
+  @no_asan('ASan does not support WASM_WORKERS')
   def test_wasm_worker_hello(self):
     self.do_run_in_out_file_test('wasm_worker/hello_wasm_worker.c', emcc_args=['-sWASM_WORKERS'])
 
   @node_pthreads
+  @no_asan('ASan does not support WASM_WORKERS')
   def test_wasm_worker_malloc(self):
     self.do_run_in_out_file_test('wasm_worker/malloc_wasm_worker.c', emcc_args=['-sWASM_WORKERS'])
 
   @node_pthreads
+  @no_asan('ASan does not support WASM_WORKERS')
   def test_wasm_worker_wait_async(self):
     self.do_runf('atomic/test_wait_async.c', emcc_args=['-sWASM_WORKERS'])