From 9871f619d5b3553216fc18fcf51e2297be87de43 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Wed, 31 Dec 2025 21:54:16 +0000 Subject: [PATCH 1/2] Fix typos in code (bugfixes) Unlike #26024, these typo fixes are actual bugfixes. Ideally each of them is better accompanied by its own test, but for many fixes I'm not sure how to test it, and the fixes themselves look very obvious. --- src/lib/libglfw.js | 2 +- src/lib/libopenal.js | 4 ++-- src/lib/libwebsocket.js | 2 +- src/threadprofiler.js | 2 +- src/wasm_worker.js | 2 +- system/include/webgl/webgl2_ext.h | 4 ++-- test/browser/test_glfw.c | 2 +- tools/cmdline.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/libglfw.js b/src/lib/libglfw.js index b03a69b321541..bd0e4c8dc4db8 100644 --- a/src/lib/libglfw.js +++ b/src/lib/libglfw.js @@ -975,7 +975,7 @@ var LibraryGLFW = { err('glfwSetInputMode called with GLFW_LOCK_KEY_MODS mode not implemented'); break; } - case 0x000330005: { // GLFW_RAW_MOUSE_MOTION + case 0x00033005: { // GLFW_RAW_MOUSE_MOTION err('glfwSetInputMode called with GLFW_RAW_MOUSE_MOTION mode not implemented'); break; } diff --git a/src/lib/libopenal.js b/src/lib/libopenal.js index 2040584348a14..772ae7c8858af 100644 --- a/src/lib/libopenal.js +++ b/src/lib/libopenal.js @@ -3778,7 +3778,7 @@ var LibraryOpenAL = { break; default: #if OPENAL_DEBUG - dbg(`alBufferData() called with invalid format ${format}`; + dbg(`alBufferData() called with invalid format ${format}`); #endif AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}}; return; @@ -3787,7 +3787,7 @@ var LibraryOpenAL = { buf.audioBuf = audioBuf; } catch (e) { #if OPENAL_DEBUG - dbg(`alBufferData() upload failed with an exception ${e}`; + dbg(`alBufferData() upload failed with an exception ${e}`); #endif AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}}; return; diff --git a/src/lib/libwebsocket.js b/src/lib/libwebsocket.js index 55e50cb1f12e4..e8db191142c00 100644 --- a/src/lib/libwebsocket.js +++ b/src/lib/libwebsocket.js @@ -161,7 +161,7 @@ var LibraryWebSocket = { } #if WEBSOCKET_DEBUG - dbg(`emscripten_websocket_set_onopen_callback(socketId=${socketId},userData=${userData},callbackFunc='+callbackFunc})`); + dbg(`emscripten_websocket_set_onopen_callback(socketId=${socketId},userData=${userData},callbackFunc=${callbackFunc})`); #endif socket.onopen = function(e) { #if WEBSOCKET_DEBUG diff --git a/src/threadprofiler.js b/src/threadprofiler.js index e4684aef5e69f..2b635e4468b5e 100644 --- a/src/threadprofiler.js +++ b/src/threadprofiler.js @@ -48,7 +48,7 @@ var emscriptenThreadProfiler = { if (threadName) { threadName = `"${threadName}" (${ptrToString(threadPtr)})`; } else { - threadName = `(${ptrToString(threadPtr)}})`; + threadName = `(${ptrToString(threadPtr)})`; } console.log(`Thread ${threadName} now: ${PThread.threadStatusAsString(threadPtr)}. `); diff --git a/src/wasm_worker.js b/src/wasm_worker.js index b34d1856ed8eb..e18a28b95c8ac 100644 --- a/src/wasm_worker.js +++ b/src/wasm_worker.js @@ -28,7 +28,7 @@ function startWasmWorker(props) { #endif // Drop now unneeded references to from the Module object in this Worker, // these are not needed anymore. - props.wasm = props.memMemory = 0; + props.wasm = props.wasmMemory = 0; } #if AUDIO_WORKLET diff --git a/system/include/webgl/webgl2_ext.h b/system/include/webgl/webgl2_ext.h index 9f24cb39ac439..92bb005b8e1c9 100644 --- a/system/include/webgl/webgl2_ext.h +++ b/system/include/webgl/webgl2_ext.h @@ -67,7 +67,7 @@ WEBGL_APICALL void GL_APIENTRY glMultiDrawElementsInstancedBaseVertexBaseInstanc const GLvoid* const* offsets __attribute__((nonnull)), const GLsizei* instanceCounts __attribute__((nonnull)), const GLint* baseVertices __attribute__((nonnull)), - const GLuint* baseinstances __attribute__((nonnull)), + const GLuint* baseInstances __attribute__((nonnull)), GLsizei drawCount); -#endif /* EMSCRIPTEN_GL_WEBGL_multi_draw_instanced_base_vertex_base_instance */ \ No newline at end of file +#endif /* EMSCRIPTEN_GL_WEBGL_multi_draw_instanced_base_vertex_base_instance */ diff --git a/test/browser/test_glfw.c b/test/browser/test_glfw.c index df1feae5aaf2f..7f31d5649e0ea 100644 --- a/test/browser/test_glfw.c +++ b/test/browser/test_glfw.c @@ -213,7 +213,7 @@ char* GetKeyName(int key){ case GLFW_KEY_TAB: return "tab"; case GLFW_KEY_ENTER: return "enter"; case GLFW_KEY_BACKSPACE: return "backspace"; - case GLFW_KEY_INSERT: return "insertr"; + case GLFW_KEY_INSERT: return "insert"; case GLFW_KEY_DEL: return "del"; case GLFW_KEY_PAGEUP: return "page up"; case GLFW_KEY_PAGEDOWN: return "page down"; diff --git a/tools/cmdline.py b/tools/cmdline.py index 995fda9f42853..8ce4faf2a7a12 100644 --- a/tools/cmdline.py +++ b/tools/cmdline.py @@ -521,7 +521,7 @@ def consume_arg_file(): override=True) elif arg == '-mno-sign-ext': feature_matrix.disable_feature(feature_matrix.Feature.SIGN_EXT) - elif arg == '-mnontrappting-fptoint': + elif arg == '-mnontrapping-fptoint': feature_matrix.enable_feature(feature_matrix.Feature.NON_TRAPPING_FPTOINT, '-mnontrapping-fptoint', override=True) From a724d25cfe3d25e9299795df42dcf74fee394f42 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Wed, 31 Dec 2025 23:41:49 +0000 Subject: [PATCH 2/2] Automatic rebaseline of codesize expectations. NFC This is an automatic change generated by tools/maint/rebaseline_tests.py. The following (3) test expectation files were updated by running the tests with `--rebaseline`: ``` test/codesize/audio_worklet_wasm.expected.js updated test/codesize/hello_wasm_worker_wasm.expected.js updated codesize/test_minimal_runtime_code_size_audio_worklet.json: 6157 => 6157 [+0 bytes / +0.00%] Average change: +0.00% (+0.00% - +0.00%) ``` --- test/codesize/audio_worklet_wasm.expected.js | 26 +++++++++---------- .../hello_wasm_worker_wasm.expected.js | 14 +++++----- ...nimal_runtime_code_size_audio_worklet.json | 4 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/codesize/audio_worklet_wasm.expected.js b/test/codesize/audio_worklet_wasm.expected.js index f18e8adf6f120..c68efe128e45e 100644 --- a/test/codesize/audio_worklet_wasm.expected.js +++ b/test/codesize/audio_worklet_wasm.expected.js @@ -2,12 +2,12 @@ var m = globalThis.Module || "undefined" != typeof Module ? Module : {}, p = !!g function v(a) { u = a; - w = a.L; + w = a.H; x(); m ||= {}; m.wasm = a.G; y(); - a.G = a.M = 0; + a.G = a.H = 0; } t && !p && (onmessage = a => { @@ -26,9 +26,9 @@ if (p) { this.u = d.u; this.s = 4 * this.u; this.B = Array(Math.min((u.F - 16) / this.s | 0, 64)); - this.K(); + this.L(); } - K() { + L() { for (var d = C(), g = D(this.B.length * this.s) >> 2, e = this.B.length - 1; 0 <= e; e--) this.B[e] = E.subarray(g, g += this.u); F(d); } @@ -81,9 +81,9 @@ if (p) { port.onmessage = async b => { await z; b = b.data; - b._boot ? v(b) : b._wpn ? (registerProcessor(b._wpn, a(b.H)), port.postMessage({ + b._boot ? v(b) : b._wpn ? (registerProcessor(b._wpn, a(b.I)), port.postMessage({ _wsc: b.v, - C: [ b.I, 1, b.A ] + C: [ b.J, 1, b.A ] })) : b._wsc && A.get(b._wsc)(...b.C); }; } @@ -134,7 +134,7 @@ var K = [], L = a => { a = { latencyHint: c, sampleRate: G[a + 4 >> 2] || void 0, - N: 0 > b ? "hardware" : b || "default" + M: 0 > b ? "hardware" : b || "default" }; } else a = void 0; a = new AudioContext(a); @@ -178,8 +178,8 @@ var K = [], L = a => { }), c += 16; O[a].audioWorklet.port.postMessage({ _wpn: d, - H: e, - I: a, + I: e, + J: a, v: b, A: h }); @@ -204,10 +204,10 @@ var K = [], L = a => { }); e.port.postMessage({ _boot: 1, - O: ba++, + N: ba++, G: m.wasm, - L: w, - J: c, + H: w, + K: c, F: b }); e.port.onmessage = ca; @@ -246,7 +246,7 @@ function y() { C = a.n; Y = a.o; A = a.k; - t ? (Y(u.J, u.F), p || (removeEventListener("message", M), K = K.forEach(L), addEventListener("message", L))) : a.i(); + t ? (Y(u.K, u.F), p || (removeEventListener("message", M), K = K.forEach(L), addEventListener("message", L))) : a.i(); t || X(); })); } diff --git a/test/codesize/hello_wasm_worker_wasm.expected.js b/test/codesize/hello_wasm_worker_wasm.expected.js index af0817a7749eb..377c6a7eb46e4 100644 --- a/test/codesize/hello_wasm_worker_wasm.expected.js +++ b/test/codesize/hello_wasm_worker_wasm.expected.js @@ -3,12 +3,12 @@ var c = Module, d = "em-ww" == globalThis.name, e, f, y, z, l, A, t; d && (onmessage = a => { onmessage = null; e = a = a.data; - f = a.o; + f = a.l; g(); c ||= {}; c.wasm = a.j; h(); - a.j = a.s = 0; + a.j = a.l = 0; }); function g() {} @@ -30,11 +30,11 @@ var k = [], n = a => { name: "em-ww" }); m.postMessage({ - u: r, + s: r, j: t, - o: f, - l: a, - m: b + l: f, + m: a, + o: b }); m.onmessage = n; return r++; @@ -67,7 +67,7 @@ function h() { y = b.g; z = b.i; l = b.h; - d ? (z(e.l, e.m), removeEventListener("message", p), k = k.forEach(n), addEventListener("message", n)) : b.f(); + d ? (z(e.m, e.o), removeEventListener("message", p), k = k.forEach(n), addEventListener("message", n)) : b.f(); d || y(); })); } diff --git a/test/codesize/test_minimal_runtime_code_size_audio_worklet.json b/test/codesize/test_minimal_runtime_code_size_audio_worklet.json index 50ff7beecdafb..21fe3d952deea 100644 --- a/test/codesize/test_minimal_runtime_code_size_audio_worklet.json +++ b/test/codesize/test_minimal_runtime_code_size_audio_worklet.json @@ -2,9 +2,9 @@ "a.html": 519, "a.html.gz": 357, "a.js": 4309, - "a.js.gz": 2219, + "a.js.gz": 2217, "a.wasm": 1329, "a.wasm.gz": 895, "total": 6157, - "total_gz": 3471 + "total_gz": 3469 }