Merge branch 'main' into update_libcxx_libcxxabi_19

Author: aheejin

.coveragerc

@@ -0,0 +1,35 @@
+[tool.coverage.run]
+source = [ "." ]
+omit = [
+  "./test/*",
+  "./third_party/*",
+  "./tools/emcoverage.py",
+  "test.py",
+]
+
+[tool.mypy]
+mypy_path = "third_party/,third_party/ply,third_party/websockify"
+files = [ "." ]
+exclude = '''
+(?x)(
+cache |
+third_party |
+conf\.py |
+emrun\.py |
+site/source/_themes/ |
+tools/scons/site_scons/site_tools/emscripten/__init__\.py |
+site/source/get_wiki\.py |
+test/parse_benchmark_output\.py
+)'''
+
+[[tool.mypy.overrides]]
+module = [
+  "tools.create_dom_pk_codes",
+  "tools.webidl_binder",
+  "tools.toolchain_profiler",
+  "tools.filelock",
+  "tools.find_bigvars",
+  "leb128",
+  "ply.*",
+]
+ignore_errors = true

.mypy.ini

@@ -7,7 +7,7 @@
 flake8==5.0.4
 flake8-bugbear==22.9.23
 flake8-unused-arguments==0.0.11
-coverage==5.5
+coverage[toml]==5.5
 mypy==0.971
 types-requests==2.27.14
 unittest-xml-reporting==3.1.0

pyproject.toml

@@ -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);
     });
   },

requirements-dev.txt

@@ -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.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);

src/library_async.js

@@ -46,6 +46,7 @@ size_t emscripten_get_heap_max(void);
 // dlmalloc and emmalloc.
 void *emscripten_builtin_memalign(size_t alignment, size_t size);
 void *emscripten_builtin_malloc(size_t size);
+void *emscripten_builtin_realloc(void *ptr, size_t size);
 void *emscripten_builtin_calloc(size_t nmemb, size_t size);
 void emscripten_builtin_free(void *ptr);
 

src/library_wget.js

@@ -6082,6 +6082,7 @@ int mspace_mallopt(int param_number, int value) {
 // This allows an easy mechanism for hooking into memory allocation.
 #if defined(__EMSCRIPTEN__) && !ONLY_MSPACES
 extern __typeof(malloc) emscripten_builtin_malloc __attribute__((alias("dlmalloc")));
+extern __typeof(realloc) emscripten_builtin_realloc __attribute__((alias("dlrealloc")));
 extern __typeof(calloc) emscripten_builtin_calloc __attribute__((alias("dlcalloc")));
 extern __typeof(free) emscripten_builtin_free __attribute__((alias("dlfree")));
 extern __typeof(memalign) emscripten_builtin_memalign __attribute__((alias("dlmemalign")));

system/include/emscripten/heap.h

@@ -1113,6 +1113,7 @@ void *emmalloc_aligned_realloc_uninitialized(void *ptr, size_t alignment, size_t
 void *emmalloc_realloc(void *ptr, size_t size) {
   return emmalloc_aligned_realloc(ptr, MALLOC_ALIGNMENT, size);
 }
+EMMALLOC_ALIAS(emscripten_builtin_realloc, emmalloc_realloc);
 EMMALLOC_ALIAS(__libc_realloc, emmalloc_realloc);
 EMMALLOC_ALIAS(realloc,        emmalloc_realloc);