Merge branch 'main' into ruff_check_--preview_--select=E303

Author: cclauss

ChangeLog.md

@@ -18,8 +18,11 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-3.1.74 (in development)
+3.1.75 (in development)
 -----------------------
+
+3.1.74 - 12/14/24
+-----------------
 - The file system was updated to independently track atime, mtime and ctime
   instead of using the same time for all three. (#22998)
 - Emscripten-generated code will now use async/await internally when loading

emscripten-version.txt

@@ -1 +1 @@
-3.1.74-git
+3.1.75-git

system/lib/jsmath.c

@@ -45,9 +45,3 @@ CALL_JS_2_TRIPLE(pow)
 CALL_JS_1_IMPL_TRIPLE(round, {
   return x >= 0 ? Math.floor(x + 0.5) : Math.ceil(x - 0.5);
 })
-CALL_JS_1_IMPL_TRIPLE(rint,  {
-  function round(x) {
-    return x >= 0 ? Math.floor(x + 0.5) : Math.ceil(x - 0.5);
-  }
-  return (x - Math.floor(x) != .5) ? round(x) : round(x / 2) * 2;
-})

test/js_optimizer/emitDCEGraph-scopes-output.js

@@ -0,0 +1,23 @@
+[
+ {
+  "name": "emcc$defun$arrowed",
+  "reaches": [],
+  "root": true
+ },
+ {
+  "name": "emcc$defun$bar",
+  "reaches": [],
+  "root": true
+ },
+ {
+  "name": "emcc$defun$caller",
+  "reaches": [
+   "emcc$defun$foo"
+  ],
+  "root": true
+ },
+ {
+  "name": "emcc$defun$foo",
+  "reaches": []
+ }
+]

test/js_optimizer/emitDCEGraph-scopes.js

@@ -0,0 +1,33 @@
+function foo() {}
+
+function bar() {}
+
+// caller() calls foo(). There is also another function called "caller", down
+// below, which should not confuse us (if it does, nothing would refer to foo,
+// and instead we'd think the toplevel caller calls bar).
+function caller() {
+  foo();
+}
+
+caller();
+
+var object = {
+  method() {
+    function caller(data) {
+      bar();
+    }
+  }
+};
+
+// Similar, with an arrow function. This should also not confuse us (it would
+// make "caller" refer to "arrowed".
+
+function arrowed() {}
+
+var arrow = () => {
+  function caller(data) {
+    arrowed();
+  }
+}
+
+wasmImports = {};

test/test_other.py

@@ -2896,6 +2896,7 @@ def test_extern_prepost(self):
     'emitDCEGraph3': (['emitDCEGraph', '--no-print'],),
     'emitDCEGraph4': (['emitDCEGraph', '--no-print'],),
     'emitDCEGraph5': (['emitDCEGraph', '--no-print'],),
+    'emitDCEGraph-scopes': (['emitDCEGraph', '--no-print'],),
     'minimal-runtime-applyDCEGraphRemovals': (['applyDCEGraphRemovals'],),
     'applyDCEGraphRemovals': (['applyDCEGraphRemovals'],),
     'applyImportAndExportNameChanges': (['applyImportAndExportNameChanges'],),