Merge branch 'main' into ruff

Author: cclauss

src/library.js

@@ -2181,18 +2181,14 @@ addToLibrary({
     return x.startsWith('dynCall_') ? x : '_' + x;
   },
 
-  $asyncLoad__docs: '/** @param {boolean=} noRunDep */',
-  $asyncLoad: (url, noRunDep) => {
+  $asyncLoad: (url) => {
     return new Promise((resolve, reject) => {
-      var dep = !noRunDep ? getUniqueRunDependency(`al ${url}`) : '';
-      if (dep) addRunDependency(dep);
       readAsync(url).then(
         (arrayBuffer) => {
   #if ASSERTIONS
           assert(arrayBuffer, `Loading data file "${url}" failed (no arrayBuffer).`);
   #endif
           resolve(new Uint8Array(arrayBuffer));
-          if (dep) removeRunDependency(dep);
         }, reject);
     });
   },

src/library_async.js

@@ -471,7 +471,7 @@ addToLibrary({
   emscripten_wget_data: (url, pbuffer, pnum, perror) => {
     return Asyncify.handleSleep((wakeUp) => {
       /* no need for run dependency, this is async but will not do any prepare etc. step */
-      asyncLoad(UTF8ToString(url), /*noRunDep=*/true).then((byteArray) => {
+      asyncLoad(UTF8ToString(url)).then((byteArray) => {
         // can only allocate the buffer after the wakeUp, not during an asyncing
         var buffer = _malloc(byteArray.length); // must be freed by caller!
         HEAPU8.set(byteArray, buffer);

src/library_wget.js

@@ -65,7 +65,7 @@ var LibraryWget = {
   emscripten_async_wget_data: (url, userdata, onload, onerror) => {
     {{{ runtimeKeepalivePush() }}}
     /* no need for run dependency, this is async but will not do any prepare etc. step */
-    asyncLoad(UTF8ToString(url), /*noRunDep=*/true).then((byteArray) => {
+    asyncLoad(UTF8ToString(url)).then((byteArray) => {
       {{{ runtimeKeepalivePop() }}}
       callUserCallback(() => {
         var buffer = _malloc(byteArray.length);

test/browser/test_offset_converter.c

@@ -1,21 +1,26 @@
+#include <assert.h>
 #include <stdio.h>
 #include <emscripten.h>
 
-void *get_pc(void) { return __builtin_return_address(0); }
+void *get_pc(void) {
+  return __builtin_return_address(0);
+}
 
-int magic_test_function(void) {
+void magic_test_function(void) {
   int result = EM_ASM_INT({
     function report(x) {
-      fetch(encodeURI('http://localhost:8888?stdout=' + x));
+      out(x);
+      fetch('http://localhost:8888?stdout=' + encodeURIComponent(x));
     }
     report('magic_test_function: input=' + $0);
     var converted = wasmOffsetConverter.getName($0);
     report('magic_test_function: converted=' + converted);
     return converted == 'magic_test_function';
   }, get_pc());
-  return result;
+  assert(result);
 }
 
 int main(void) {
-  return magic_test_function();
+  magic_test_function();
+  return 0;
 }

test/other/codesize/test_codesize_hello_dylink.gzsize

@@ -1 +1 @@
-6294
+6276

test/other/codesize/test_codesize_hello_dylink.jssize

@@ -1 +1 @@
-13863
+13831

test/test_browser.py

@@ -4948,8 +4948,12 @@ def test_minimal_runtime_loader_shell(self, args):
   def test_minimal_runtime_hello_world(self, args):
     self.btest_exit('small_hello_world.c', args=args + ['-sMINIMAL_RUNTIME'])
 
-  def test_offset_converter(self, *args):
-    self.btest_exit('test_offset_converter.c', assert_returncode=1, args=['-sUSE_OFFSET_CONVERTER', '-gsource-map', '-sPROXY_TO_PTHREAD', '-pthread'])
+  @parameterized({
+    '': ([],),
+    'pthread': (['-sPROXY_TO_PTHREAD', '-pthread'],)
+  })
+  def test_offset_converter(self, args):
+    self.btest_exit('test_offset_converter.c', args=['-sUSE_OFFSET_CONVERTER', '-gsource-map'] + args)
 
   # Tests emscripten_unwind_to_js_event_loop() behavior
   def test_emscripten_unwind_to_js_event_loop(self, *args):

test/test_sockets.py

@@ -285,7 +285,7 @@ def test_enet(self):
     'native': [WebsockifyServerHarness, 59160, ['-DTEST_DGRAM=0']],
     'tcp': [CompiledServerHarness, 59162, ['-DTEST_DGRAM=0']],
     'udp': [CompiledServerHarness, 59164, ['-DTEST_DGRAM=1']],
-    'pthread': [CompiledServerHarness, 59165, ['-pthread', '-sPROXY_TO_PTHREAD']],
+    'pthread': [CompiledServerHarness, 59166, ['-pthread', '-sPROXY_TO_PTHREAD']],
   })
   def test_nodejs_sockets_echo(self, harness_class, port, args):
     if harness_class == WebsockifyServerHarness and common.EMTEST_LACKS_NATIVE_CLANG:
@@ -304,12 +304,12 @@ def test_nodejs_sockets_echo_subprotocol(self):
     # Test against a Websockified server with compile time configured WebSocket subprotocol. We use a Websockified
     # server because as long as the subprotocol list contains binary it will configure itself to accept binary
     # This test also checks that the connect url contains the correct subprotocols.
-    with WebsockifyServerHarness(test_file('sockets/test_sockets_echo_server.c'), [], 59166):
-      self.run_process([EMCC, '-Werror', test_file('sockets/test_sockets_echo_client.c'), '-o', 'client.js', '-sSOCKET_DEBUG', '-sWEBSOCKET_SUBPROTOCOL="base64, binary"', '-DSOCKK=59166'])
+    with WebsockifyServerHarness(test_file('sockets/test_sockets_echo_server.c'), [], 59168):
+      self.run_process([EMCC, '-Werror', test_file('sockets/test_sockets_echo_client.c'), '-o', 'client.js', '-sSOCKET_DEBUG', '-sWEBSOCKET_SUBPROTOCOL="base64, binary"', '-DSOCKK=59168'])
 
       out = self.run_js('client.js')
       self.assertContained('do_msg_read: read 14 bytes', out)
-      self.assertContained(['connect: ws://127.0.0.1:59166, base64,binary', 'connect: ws://127.0.0.1:59166/, base64,binary'], out)
+      self.assertContained(['connect: ws://127.0.0.1:59168, base64,binary', 'connect: ws://127.0.0.1:59168/, base64,binary'], out)
 
   @requires_native_clang
   def test_nodejs_sockets_echo_subprotocol_runtime(self):