Merge branch 'main' into bigint_on

Author: dschuff

ChangeLog.md

@@ -22,14 +22,18 @@ See docs/process.md for more on how version tagging works.
 -----------------------
 - The file system was updated to independently track atime, mtime and ctime
   instead of using the same time for all three. (#22998)
-- The minimum supported chrome version was bumped from 32 to 33. (#23077)
 - Emscripten-generated code will now use async/await internally when loading
   the Wasm module.  This will be lowered away by babel when targeting older
   browsers. (#23068)
 - Due to the discontinued support for invalid specializations of
 - `std::basic_string` (https://github.com/llvm/llvm-project/pull/72694), the
   support for `std::basic_string<unsigned char>` was removed from embind.
   (#23070)
+- The minimum supported versions of browser engines that we support were updated
+  to versions that support Promise, Fetch and Object.asign APIs, allowing the 
+  polyfills for these to be removed.  Chrome 32 -> 45, Firefox 34 -> 40, Safari
+  9.0 -> 10.1.  These browser engines version are all over 8 years old now.
+  (#23077, #23118)
 
 3.1.73 - 11/28/24
 -----------------

src/closure-externs/node-externs.js

@@ -86,6 +86,12 @@ Buffer.from = function(arrayBufferOrString, byteOffsetOrEncoding, length) {};
  */
 Buffer.alloc = function(size, fill, encoding) {};
 
+/**
+ * @return {boolean}
+ * @nosideeffects
+ */
+Buffer.isBuffer = function(obj) {};
+
 /**
  * @param {number=} start
  * @param {number=} end

src/node_shell_read.js

@@ -9,18 +9,17 @@ readBinary = (filename) => {
   filename = isFileURI(filename) ? new URL(filename) : filename;
   var ret = fs.readFileSync(filename);
 #if ASSERTIONS
-  assert(ret.buffer);
+  assert(Buffer.isBuffer(ret));
 #endif
   return ret;
 };
 
-readAsync = (filename, binary = true) => {
+readAsync = async (filename, binary = true) => {
   // See the comment in the `readBinary` function.
   filename = isFileURI(filename) ? new URL(filename) : filename;
-  return new Promise((resolve, reject) => {
-    fs.readFile(filename, binary ? undefined : 'utf8', (err, data) => {
-      if (err) reject(err);
-      else resolve(binary ? data.buffer : data);
-    });
-  });
+  var ret = fs.readFileSync(filename, binary ? undefined : 'utf8');
+#if ASSERTIONS
+  assert(binary ? Buffer.isBuffer(ret) : typeof ret == 'string');
+#endif
+  return ret;
 };

src/polyfill/fetch.js

@@ -34,21 +34,11 @@ var Module = typeof {{{ EXPORT_NAME }}} != 'undefined' ? {{{ EXPORT_NAME }}} : {
 #endif // USE_CLOSURE_COMPILER
 
 #if POLYFILL
-#if MIN_CHROME_VERSION < 45 || MIN_FIREFOX_VERSION < 34 || MIN_SAFARI_VERSION < 90000
-// See https://caniuse.com/mdn-javascript_builtins_object_assign
-#include "polyfill/objassign.js"
-#endif
-
 #if WASM_BIGINT && MIN_SAFARI_VERSION < 140100
 // TODO(features): Fix this back to 150000
 // See https://caniuse.com/mdn-javascript_builtins_bigint64array
 #include "polyfill/bigint64array.js"
 #endif
-
-#if MIN_CHROME_VERSION < 40 || MIN_FIREFOX_VERSION < 39 || MIN_SAFARI_VERSION < 103000
-// See https://caniuse.com/fetch
-#include "polyfill/fetch.js"
-#endif
 #endif // POLYFILL
 
 #if MODULARIZE
@@ -301,11 +291,7 @@ if (ENVIRONMENT_IS_SHELL) {
     return data;
   };
 
-  readAsync = (f) => {
-    return new Promise((resolve, reject) => {
-      setTimeout(() => resolve(readBinary(f)));
-    });
-  };
+  readAsync = async (f) => readBinary(f);
 
   globalThis.clearTimeout ??= (id) => {};
 

src/polyfill/objassign.js

@@ -128,13 +128,6 @@ function ready() {
 #endif
 }
 
-#if POLYFILL
-// See https://caniuse.com/mdn-javascript_builtins_object_assign
-#if MIN_CHROME_VERSION < 45 || MIN_FIREFOX_VERSION < 34 || MIN_SAFARI_VERSION < 90000
-#include "polyfill/objassign.js"
-#endif
-#endif
-
 #if PTHREADS
 // MINIMAL_RUNTIME does not support --proxy-to-worker option, so Worker and Pthread environments
 // coincide.

src/shell.js

@@ -16,7 +16,7 @@
   }
 #endif
 
-  readAsync = (url) => {
+  readAsync = async (url) => {
 #if ENVIRONMENT_MAY_BE_WEBVIEW
     // Fetch has some additional restrictions over XHR, like it can't be used on a file:// url.
     // See https://github.com/github/fetch/pull/92#issuecomment-140665932
@@ -41,11 +41,9 @@
 #elif ASSERTIONS
     assert(!isFileURI(url), "readAsync does not work with file:// URLs");
 #endif
-    return fetch(url, {{{ makeModuleReceiveExpr('fetchSettings', "{ credentials: 'same-origin' }") }}})
-      .then((response) => {
-        if (response.ok) {
-          return response.arrayBuffer();
-        }
-        return Promise.reject(new Error(response.status + ' : ' + response.url));
-      })
+    var response = await fetch(url, {{{ makeModuleReceiveExpr('fetchSettings', "{ credentials: 'same-origin' }") }}});
+    if (response.ok) {
+      return response.arrayBuffer();
+    }
+    throw new Error(response.status + ' : ' + response.url);
   };

src/shell_minimal.js

@@ -29,7 +29,7 @@ extern "C" {
 // Math.ceil -> f32.ceil and f64.ceil (ceil() and ceilf() in math.h)
 // Math.clz32(x) -> i32.clz and i64.clz (call __builtin_clz() and __builtin_clzll())
 // Math.floor -> f32.floor and f64.floor (floor() and floorf() in math.h)
-// Math.fround -> f64.promote_f32(f32.demote_f64()) (call double d = (double)(float)someDouble;)
+// Math.fround -> f64.promote_f32(f32.demote_f64()) (double d = (double)(float)someDouble;)
 // Math.imul(x, y) -> i32.mul and i64.mul (directly multiply two signed integers)
 // Math.min -> f32.min and f64.min (fminf() and fmin() in math.h)
 // Math.max -> f32.max and f64.max (fmaxf() and fmax() in math.h)

src/web_or_worker_shell_read.js

@@ -2,41 +2,37 @@
 // See JS_MATH setting in settings.js for details.
 //
 
-#include <emscripten.h>
+#include <emscripten/em_math.h>
+#include <emscripten/em_js.h>
 #include <math.h>
 #include <stdlib.h>
 
 #define CALL_JS_1(cname, jsname, type) \
-  EM_JS(type, JS_##cname, (type x), { return jsname(x) }); \
-  type cname(type x) { return JS_##cname(x); }
-
-#define CALL_JS_1_TRIPLE(cname, jsname) \
-  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)
-CALL_JS_1_TRIPLE(tan, Math.tan)
-CALL_JS_1_TRIPLE(acos, Math.acos)
-CALL_JS_1_TRIPLE(asin, Math.asin)
-CALL_JS_1_TRIPLE(atan, Math.atan)
-CALL_JS_1_TRIPLE(exp, Math.exp)
-CALL_JS_1_TRIPLE(log, Math.log)
-CALL_JS_1_TRIPLE(sqrt, Math.sqrt)
-CALL_JS_1_TRIPLE(fabs, Math.abs)
-CALL_JS_1_TRIPLE(ceil, Math.ceil)
-CALL_JS_1_TRIPLE(floor, Math.floor)
+  type cname(type x) { return (type)emscripten_math_##jsname(x); }
+
+#define CALL_JS_1_TRIPLE(name) \
+  CALL_JS_1(name, name, double) \
+  CALL_JS_1(name##f, name, float)
+
+CALL_JS_1_TRIPLE(cos)
+CALL_JS_1_TRIPLE(sin)
+CALL_JS_1_TRIPLE(tan)
+CALL_JS_1_TRIPLE(acos)
+CALL_JS_1_TRIPLE(asin)
+CALL_JS_1_TRIPLE(atan)
+CALL_JS_1_TRIPLE(exp)
+CALL_JS_1_TRIPLE(log)
+CALL_JS_1_TRIPLE(sqrt)
 
 #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(x, y); }
+  type cname(type x, type y) { return (type)emscripten_math_##jsname(x, y); }
 
-#define CALL_JS_2_TRIPLE(cname, jsname) \
-  CALL_JS_2(cname, jsname, double) \
-  CALL_JS_2(cname##f, jsname, float)
+#define CALL_JS_2_TRIPLE(name) \
+  CALL_JS_2(name, name, double) \
+  CALL_JS_2(name##f, name, float)
 
-CALL_JS_2_TRIPLE(atan2, Math.atan2)
-CALL_JS_2_TRIPLE(pow, Math.pow)
+CALL_JS_2_TRIPLE(atan2)
+CALL_JS_2_TRIPLE(pow)
 
 #define CALL_JS_1_IMPL(cname, type, impl) \
   EM_JS(type, JS_##cname, (type x), impl); \
@@ -55,6 +51,3 @@ CALL_JS_1_IMPL_TRIPLE(rint,  {
   }
   return (x - Math.floor(x) != .5) ? round(x) : round(x / 2) * 2;
 })
-
-double nearbyint(double x) { return rint(x); }
-float nearbyintf(float x) { return rintf(x); }