rebaseline

dschuff · dschuff · commit 22165afbb592 · 2024-12-12T17:52:05.000-08:00
diff --git a/docs/emcc.txt b/docs/emcc.txt
@@ -252,7 +252,7 @@ Options that are modified or new in *emcc* are listed below:
 "--closure 0|1|2"
    [link] Runs the *Closure Compiler*. Possible values are:
 
-      * "0": No closure compiler (default in "-O2" and below).
+      * "0": No closure compiler (default).
 
       * "1": Run closure compiler. This greatly reduces the size of
         the support JavaScript code (everything but the WebAssembly or
@@ -277,9 +277,6 @@ Options that are modified or new in *emcc* are listed below:
        before the closure-compiled code runs, because then it will
        reuse that variable.
 
-     * Closure is only run if JavaScript opts are being done ("-O2" or
-       above).
-
 "--closure-args=<args>"
    [link] Pass arguments to the *Closure compiler*. This is an
    alternative to "EMCC_CLOSURE_ARGS".
diff --git a/site/source/docs/tools_reference/emcc.rst b/site/source/docs/tools_reference/emcc.rst
@@ -262,15 +262,14 @@ Options that are modified or new in *emcc* are listed below:
   [link]
   Runs the :term:`Closure Compiler`. Possible values are:
 
-    - ``0``: No closure compiler (default in ``-O2`` and below).
+    - ``0``: No closure compiler (default).
     - ``1``: Run closure compiler. This greatly reduces the size of the support JavaScript code (everything but the WebAssembly or asm.js). Note that this increases compile time significantly.
     - ``2``: Run closure compiler on *all* the emitted code, even on **asm.js** output in **asm.js** mode. This can further reduce code size, but does prevent a significant amount of **asm.js** optimizations, so it is not recommended unless you want to reduce code size at all costs.
 
   .. note::
 
     - Consider using ``-sMODULARIZE`` when using closure, as it minifies globals to names that might conflict with others in the global scope. ``MODULARIZE`` puts all the output into a function (see ``src/settings.js``).
     - Closure will minify the name of `Module` itself, by default! Using ``MODULARIZE`` will solve that as well. Another solution is to make sure a global variable called `Module` already exists before the closure-compiled code runs, because then it will reuse that variable.
-    - Closure is only run if JavaScript opts are being done (``-O2`` or above).
 
 ``--closure-args=<args>``
    [link]
diff --git a/system/include/emscripten/webaudio.h b/system/include/emscripten/webaudio.h
@@ -62,7 +62,7 @@ void emscripten_destroy_web_audio_node(EMSCRIPTEN_WEBAUDIO_T objectHandle);
 // Create Wasm AudioWorklet thread. Call this function once at application startup to establish an AudioWorkletGlobalScope for your app.
 // After the scope has been initialized, the given callback will fire.
 // audioContext: The Web Audio context object to initialize the Wasm AudioWorklet thread on. Each AudioContext can have only one AudioWorklet
-//               thread running, so do not call this function a multiple times on the same AudioContext.
+//               thread running, so do not call this function multiple times on the same AudioContext.
 // stackLowestAddress: The base address for the thread's stack. Must be aligned to 16 bytes. Use e.g. memalign(16, 1024) to allocate a 1KB stack for the thread.
 // stackSize: The size of the thread's stack. Must be a multiple of 16 bytes.
 // callback: The callback function that will be run when thread creation either succeeds or fails.
@@ -76,8 +76,8 @@ typedef int WEBAUDIO_PARAM_AUTOMATION_RATE;
 typedef struct WebAudioParamDescriptor
 {
 	float defaultValue; // Default == 0.0
-	float minValue; // Default = -3.4028235e38;
-	float maxValue; // Default = 3.4028235e38;
+	float minValue; // Default = -3.4028235e38
+	float maxValue; // Default = 3.4028235e38
 	WEBAUDIO_PARAM_AUTOMATION_RATE automationRate; // Either WEBAUDIO_PARAM_A_RATE or WEBAUDIO_PARAM_K_RATE. Default = WEBAUDIO_PARAM_A_RATE
 } WebAudioParamDescriptor;
 
@@ -96,7 +96,7 @@ typedef void (*EmscriptenWorkletProcessorCreatedCallback)(EMSCRIPTEN_WEBAUDIO_T
 void emscripten_create_wasm_audio_worklet_processor_async(EMSCRIPTEN_WEBAUDIO_T audioContext, const WebAudioWorkletProcessorCreateOptions *options, EmscriptenWorkletProcessorCreatedCallback callback, void *userData3);
 
 // Returns the number of samples processed per channel in an AudioSampleFrame, fixed at 128 in the Web Audio API 1.0 specification, and valid for the lifetime of the audio context.
-// For this to change from the default 128, the context would need creating with a yet unexposed WebAudioWorkletProcessorCreateOptions renderSizeHint, part of the 1.1 Web Audio API.
+// For this to change from the default 128, the context would need to be created with a yet unexposed WebAudioWorkletProcessorCreateOptions renderSizeHint, part of the 1.1 Web Audio API.
 int emscripten_audio_context_quantum_size(EMSCRIPTEN_WEBAUDIO_T audioContext);
 
 typedef int EMSCRIPTEN_AUDIO_WORKLET_NODE_T;
@@ -148,15 +148,15 @@ bool emscripten_current_thread_is_audio_worklet(void);
 
 #define EMSCRIPTEN_AUDIO_MAIN_THREAD 0
 
-/* emscripten_audio_worklet_function_*: Post a pointer to a C/C++ function to be executed either
-  on the Audio Worklet thread of the given Web Audio context. Notes:
+/* emscripten_audio_worklet_function_*: Post a pointer to a C/C++ function to be executed on the Audio Worklet 
+   thread of the given Web Audio context. Notes:
  - If running inside an Audio Worklet thread, specify ID EMSCRIPTEN_AUDIO_MAIN_THREAD (== 0) to pass a message
    from the audio worklet to the main thread.
  - When specifying non-zero ID, the Audio Context denoted by the ID must have been created by the calling thread.
  - Passing messages between audio thread and main thread with this family of functions is relatively slow and has
    a really high latency cost compared to direct coordination using atomics and synchronization primitives like
-   mutexes and synchronization primitives. Additionally these functions will generate garbage on the JS heap.
-   Therefore avoid using these functions where performance is critical. */
+   mutexes. Additionally these functions will generate garbage on the JS heap. Therefore avoid using these
+   functions where performance is critical. */
 void emscripten_audio_worklet_post_function_v(EMSCRIPTEN_WEBAUDIO_T id, void (*funcPtr)(void));
 void emscripten_audio_worklet_post_function_vi(EMSCRIPTEN_WEBAUDIO_T id, void (*funcPtr)(int), int arg0);
 void emscripten_audio_worklet_post_function_vii(EMSCRIPTEN_WEBAUDIO_T id, void (*funcPtr)(int, int), int arg0, int arg1);
diff --git a/system/lib/jsmath.c b/system/lib/jsmath.c
@@ -6,13 +6,13 @@
 #include <math.h>
 #include <stdlib.h>
 
-#define CALL_JS_1(cname, jsname, type, casttype) \
+#define CALL_JS_1(cname, jsname, type) \
   EM_JS(type, JS_##cname, (type x), { return jsname(x) }); \
-  type cname(type x) { return JS_##cname((casttype)x); }
+  type cname(type x) { return JS_##cname(x); }
 
 #define CALL_JS_1_TRIPLE(cname, jsname) \
-  CALL_JS_1(cname, jsname, double, double) \
-  CALL_JS_1(cname##f, jsname, float, float)
+  CALL_JS_1(cname, jsname, double) \
+  CALL_JS_1(cname##f, jsname, float)
 
 CALL_JS_1_TRIPLE(cos, Math.cos)
 CALL_JS_1_TRIPLE(sin, Math.sin)
@@ -27,24 +27,24 @@ CALL_JS_1_TRIPLE(fabs, Math.abs)
 CALL_JS_1_TRIPLE(ceil, Math.ceil)
 CALL_JS_1_TRIPLE(floor, Math.floor)
 
-#define CALL_JS_2(cname, jsname, type, casttype) \
+#define CALL_JS_2(cname, jsname, type) \
   EM_JS(type, JS_##cname, (type x, type y), { return jsname(x, y) }); \
-  type cname(type x, type y) { return JS_##cname((casttype)x, (casttype)y); }
+  type cname(type x, type y) { return JS_##cname(x, y); }
 
 #define CALL_JS_2_TRIPLE(cname, jsname) \
-  CALL_JS_2(cname, jsname, double, double) \
-  CALL_JS_2(cname##f, jsname, float, float)
+  CALL_JS_2(cname, jsname, double) \
+  CALL_JS_2(cname##f, jsname, float)
 
 CALL_JS_2_TRIPLE(atan2, Math.atan2)
 CALL_JS_2_TRIPLE(pow, Math.pow)
 
-#define CALL_JS_1_IMPL(cname, type, casttype, impl) \
+#define CALL_JS_1_IMPL(cname, type, impl) \
   EM_JS(type, JS_##cname, (type x), impl); \
-  type cname(type x) { return JS_##cname((casttype)x); }
+  type cname(type x) { return JS_##cname(x); }
 
 #define CALL_JS_1_IMPL_TRIPLE(cname, impl) \
-  CALL_JS_1_IMPL(cname, double, double, impl) \
-  CALL_JS_1_IMPL(cname##f, float, float, impl)
+  CALL_JS_1_IMPL(cname, double, impl) \
+  CALL_JS_1_IMPL(cname##f, float, impl)
 
 CALL_JS_1_IMPL_TRIPLE(round, {
   return x >= 0 ? Math.floor(x + 0.5) : Math.ceil(x - 0.5);
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-128911
+128974
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128360
+128423
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171023
+171008
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142224
+142223
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
@@ -1 +1 @@
-144811
+144810
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-121868
+121924
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232669
+232517
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-131718
+131781
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-168865
+168928
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-15130
+15142
diff --git a/test/other/test_INCOMING_MODULE_JS_API.js.size b/test/other/test_INCOMING_MODULE_JS_API.js.size
@@ -1 +1 @@
-4018
+3851
diff --git a/test/other/test_unoptimized_code_size.wasm.size b/test/other/test_unoptimized_code_size.wasm.size
@@ -1 +1 @@
-15130
+15142
diff --git a/test/other/test_unoptimized_code_size_no_asserts.wasm.size b/test/other/test_unoptimized_code_size_no_asserts.wasm.size
@@ -1 +1 @@
-12211
+12223
diff --git a/test/other/test_unoptimized_code_size_strict.wasm.size b/test/other/test_unoptimized_code_size_strict.wasm.size
@@ -1 +1 @@
-15130
+15142
diff --git a/test/pthread/call_async_on_main_thread.js b/test/pthread/call_async_on_main_thread.js
@@ -7,6 +7,6 @@ addToLibrary({
       console.error('This function should be getting called on the main thread!');
     }
     console.log('got ' + param1 + ' ' + param2 + ' ' + param3);
-    __ReportResult(param1 + param2 * param3);
+    reportResultToServer(param1 + param2 * param3);
   }
 });
diff --git a/test/report_result.c b/test/report_result.c
@@ -21,11 +21,11 @@ extern "C" {
 
 #if defined __EMSCRIPTEN__ && !defined EMTEST_NODE
 
-void EMSCRIPTEN_KEEPALIVE _ReportResult(int result) {
+void _ReportResult(int result) {
   EM_ASM(reportResultToServer($0), result);
 }
 
-void EMSCRIPTEN_KEEPALIVE _MaybeReportResult(int result) {
+void _MaybeReportResult(int result) {
   EM_ASM(maybeReportResultToServer($0), result);
 }
 
diff --git a/test/webaudio/create_webaudio.c b/test/webaudio/create_webaudio.c
@@ -23,9 +23,7 @@ int main()
 		startButton.onclick = () => {
 			if (audioContext.state != 'running') {
 				audioContext.resume();
-#ifdef REPORT_RESULT
-				__ReportResult(0);
-#endif
+				reportResultToServer(0);
 			} else {
 				audioContext.suspend();
 			}
diff --git a/tools/link.py b/tools/link.py
@@ -1408,6 +1408,8 @@ def phase_linker_setup(options, state, newargs):  # noqa: C901, PLR0912, PLR0915
       # MINIMAL_RUNTIME exports these manually, since this export mechanism is placed
       # in global scope that is not suitable for MINIMAL_RUNTIME loader.
       settings.EXPORTED_RUNTIME_METHODS += ['stackSave', 'stackAlloc', 'stackRestore', 'wasmTable']
+      # The following symbols need exposing to load and bootstrap the audio worklet:
+      settings.INCOMING_MODULE_JS_API += ['instantiateWasm', 'wasm', 'wasmMemory']
 
   if settings.FORCE_FILESYSTEM and not settings.MINIMAL_RUNTIME:
     # when the filesystem is forced, we export by default methods that filesystem usage
