Merge branch 'main' into bigint_on

Author: dschuff

ChangeLog.md

@@ -23,6 +23,13 @@ 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)
 
 3.1.73 - 11/28/24
 -----------------

emcc.py

@@ -391,6 +391,7 @@ def get_clang_flags(user_args):
     # Bulk memory may be enabled via threads or directly via -s.
     if not settings.BULK_MEMORY:
       flags.append('-mno-bulk-memory')
+      flags.append('-mno-bulk-memory-opt')
   if '-mnontrapping-fptoint' not in user_args and '-mno-nontrapping-fptoint' not in user_args:
     flags.append('-mno-nontrapping-fptoint')
 

site/source/docs/porting/files/Synchronous-Virtual-XHR-Backed-File-System-Usage.rst

@@ -63,6 +63,6 @@ Instructions
 
   .. include:: ../../../../../test/test_browser.py
     :literal:
-    :start-after: create_file('main.html',
-    :end-before: """ % (worker_filename, self.port))
+    :start-after: create_file('main.html', '''
+    :end-before: ''' % self.PORT)
     :code: html

src/embind/embind.js

@@ -496,8 +496,7 @@ var LibraryEmbind = {
     name = readLatin1String(name);
     var stdStringIsUTF8
 #if EMBIND_STD_STRING_IS_UTF8
-    //process only std::string bindings with UTF8 support, in contrast to e.g. std::basic_string<unsigned char>
-    = (name === "std::string");
+    = true;
 #else
     = false;
 #endif

src/library_webgl.js

@@ -940,7 +940,6 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
       gl.uniform1i(gl.getUniformLocation(blitProgram, "sampler"), 0);
       gl.useProgram(null);
 
-      context.defaultVao = undefined;
       if (gl.createVertexArray) {
         context.defaultVao = gl.createVertexArray();
         gl.bindVertexArray(context.defaultVao);
@@ -1020,17 +1019,13 @@ for (/**@suppress{duplicate}*/var i = 0; i <= {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
           gl.drawArrays(5/*GL_TRIANGLE_STRIP*/, 0, 4);
         }
 
-#if !OFFSCREEN_FRAMEBUFFER_FORBID_VAO_PATH
         if (context.defaultVao) {
           // WebGL 2 or OES_vertex_array_object
           var prevVAO = gl.getParameter(0x85B5 /*GL_VERTEX_ARRAY_BINDING*/);
           gl.bindVertexArray(context.defaultVao);
           draw();
           gl.bindVertexArray(prevVAO);
-        }
-        else
-#endif
-        {
+        } else {
           var prevVertexAttribPointer = {
             buffer: gl.getVertexAttrib(context.blitPosLoc, 0x889F /*GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING*/),
             size: gl.getVertexAttrib(context.blitPosLoc, 0x8623 /*GL_VERTEX_ATTRIB_ARRAY_SIZE*/),

src/preamble.js

@@ -647,7 +647,7 @@ function getBinarySync(file) {
 #endif
 }
 
-function getBinaryPromise(binaryFile) {
+async function getWasmBinary(binaryFile) {
 #if !SINGLE_FILE
   // If we don't have the binary yet, load it asynchronously using readAsync.
   if (!wasmBinary
@@ -656,16 +656,17 @@ function getBinaryPromise(binaryFile) {
 #endif
       ) {
     // Fetch the binary using readAsync
-    return readAsync(binaryFile).then(
-      (response) => new Uint8Array(/** @type{!ArrayBuffer} */(response)),
-      // Fall back to getBinarySync if readAsync fails
-      () => getBinarySync(binaryFile)
-    );
+    try {
+      var response = await readAsync(binaryFile);
+      return new Uint8Array(response);
+    } catch {
+      // Fall back to getBinarySync below;
+    }
   }
 #endif
 
   // Otherwise, getBinarySync should be able to get it synchronously
-  return Promise.resolve(getBinarySync(binaryFile));
+  return getBinarySync(binaryFile);
 }
 
 #if LOAD_SOURCE_MAP
@@ -773,56 +774,47 @@ function resetPrototype(constructor, attrs) {
 #endif
 
 #if WASM_ASYNC_COMPILATION
-function instantiateArrayBuffer(binaryFile, imports) {
+async function instantiateArrayBuffer(binaryFile, imports) {
+  try {
+    var binary = await getWasmBinary(binaryFile);
+    var instance = await WebAssembly.instantiate(binary, imports);
 #if USE_OFFSET_CONVERTER
-  var savedBinary;
+    // wasmOffsetConverter needs to be assigned before calling resolve.
+    // See comments below in instantiateAsync.
+    wasmOffsetConverter = new WasmOffsetConverter(binary, instance.module);
 #endif
-  return new Promise((resolve, reject) => {
-    getBinaryPromise(binaryFile).then((binary) => {
-#if USE_OFFSET_CONVERTER
-      savedBinary = binary;
-#endif
-      return WebAssembly.instantiate(binary, imports);
-#if USE_OFFSET_CONVERTER
-    }).then((instance) => {
-      // wasmOffsetConverter needs to be assigned before calling resolve.
-      // See comments below in instantiateAsync.
-      wasmOffsetConverter = new WasmOffsetConverter(savedBinary, instance.module);
-      return instance;
-#endif
-    }).then(resolve, (reason) => {
-      err(`failed to asynchronously prepare wasm: ${reason}`);
-
+    return instance;
+  } catch (reason) {
+    err(`failed to asynchronously prepare wasm: ${reason}`);
 #if WASM == 2
 #if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
-      if (typeof location != 'undefined') {
-#endif
-        // WebAssembly compilation failed, try running the JS fallback instead.
-        var search = location.search;
-        if (search.indexOf('_rwasm=0') < 0) {
-          location.href += (search ? search + '&' : '?') + '_rwasm=0';
-          // Return here to avoid calling abort() below.  The application
-          // still has a chance to start successfully do we don't want to
-          // trigger onAbort or onExit handlers.
-          return;
-        }
-#if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
+    if (typeof location != 'undefined') {
+#endif
+      // WebAssembly compilation failed, try running the JS fallback instead.
+      var search = location.search;
+      if (search.indexOf('_rwasm=0') < 0) {
+        // Reload the page with the `_rwasm=0` argument
+        location.href += (search ? search + '&' : '?') + '_rwasm=0';
+        // Return a promise that never resolves.  We don't want to
+        // call abort below, or return an error to our caller.
+        return new Promise(() => {});
       }
+#if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
+    }
 #endif
 #endif // WASM == 2
 
 #if ASSERTIONS
-      // Warn on some common problems.
-      if (isFileURI(wasmBinaryFile)) {
-        err(`warning: Loading from a file URI (${wasmBinaryFile}) is not supported in most browsers. See https://emscripten.org/docs/getting_started/FAQ.html#how-do-i-run-a-local-webserver-for-testing-why-does-my-program-stall-in-downloading-or-preparing`);
-      }
+    // Warn on some common problems.
+    if (isFileURI(wasmBinaryFile)) {
+      err(`warning: Loading from a file URI (${wasmBinaryFile}) is not supported in most browsers. See https://emscripten.org/docs/getting_started/FAQ.html#how-do-i-run-a-local-webserver-for-testing-why-does-my-program-stall-in-downloading-or-preparing`);
+    }
 #endif
-      abort(reason);
-    });
-  });
+    abort(reason);
+  }
 }
 
-function instantiateAsync(binary, binaryFile, imports) {
+async function instantiateAsync(binary, binaryFile, imports) {
 #if !SINGLE_FILE
   if (!binary &&
       typeof WebAssembly.instantiateStreaming == 'function' &&
@@ -841,56 +833,41 @@ function instantiateAsync(binary, binaryFile, imports) {
       !ENVIRONMENT_IS_NODE &&
 #endif
       typeof fetch == 'function') {
-    return new Promise((resolve) => {
-      fetch(binaryFile, {{{ makeModuleReceiveExpr('fetchSettings', "{ credentials: 'same-origin' }") }}}).then((response) => {
-        // Suppress closure warning here since the upstream definition for
-        // instantiateStreaming only allows Promise<Repsponse> rather than
-        // an actual Response.
-        // TODO(https://github.com/google/closure-compiler/pull/3913): Remove if/when upstream closure is fixed.
-        /** @suppress {checkTypes} */
-        var result = WebAssembly.instantiateStreaming(response, imports);
-
+    try {
+      var response = fetch(binaryFile, {{{ makeModuleReceiveExpr('fetchSettings', "{ credentials: 'same-origin' }") }}});
 #if USE_OFFSET_CONVERTER
-        // We need the wasm binary for the offset converter. Clone the response
-        // in order to get its arrayBuffer (cloning should be more efficient
-        // than doing another entire request).
-        // (We must clone the response now in order to use it later, as if we
-        // try to clone it asynchronously lower down then we will get a
-        // "response was already consumed" error.)
-        var clonedResponsePromise = response.clone().arrayBuffer();
-#endif
-
-        result.then(
+      // We need the wasm binary for the offset converter. Clone the response
+      // in order to get its arrayBuffer (cloning should be more efficient
+      // than doing another entire request).
+      // (We must clone the response now in order to use it later, as if we
+      // try to clone it asynchronously lower down then we will get a
+      // "response was already consumed" error.)
+      var clonedResponse = (await response).clone();
+#endif
+      var instantiationResult = await WebAssembly.instantiateStreaming(response, imports);
 #if USE_OFFSET_CONVERTER
-          (instantiationResult) => {
-            // When using the offset converter, we must interpose here. First,
-            // the instantiation result must arrive (if it fails, the error
-            // handling later down will handle it). Once it arrives, we can
-            // initialize the offset converter. And only then is it valid to
-            // call receiveInstantiationResult, as that function will use the
-            // offset converter (in the case of pthreads, it will create the
-            // pthreads and send them the offsets along with the wasm instance).
-
-            clonedResponsePromise.then((arrayBufferResult) => {
-                wasmOffsetConverter = new WasmOffsetConverter(new Uint8Array(arrayBufferResult), instantiationResult.module);
-                resolve(instantiationResult);
-              },
-              (reason) => err(`failed to initialize offset-converter: ${reason}`)
-            );
-          },
-#else
-          resolve,
-#endif
-          (reason) => {
-            // We expect the most common failure cause to be a bad MIME type for the binary,
-            // in which case falling back to ArrayBuffer instantiation should work.
-            err(`wasm streaming compile failed: ${reason}`);
-            err('falling back to ArrayBuffer instantiation');
-            return resolve(instantiateArrayBuffer(binaryFile, imports));
-          }
-        );
-      });
-    });
+      // When using the offset converter, we must interpose here. First,
+      // the instantiation result must arrive (if it fails, the error
+      // handling later down will handle it). Once it arrives, we can
+      // initialize the offset converter. And only then is it valid to
+      // call receiveInstantiationResult, as that function will use the
+      // offset converter (in the case of pthreads, it will create the
+      // pthreads and send them the offsets along with the wasm instance).
+      var arrayBufferResult = await clonedResponse.arrayBuffer();
+      try {
+        wasmOffsetConverter = new WasmOffsetConverter(new Uint8Array(arrayBufferResult), instantiationResult.module);
+      } catch (reason) {
+        err(`failed to initialize offset-converter: ${reason}`);
+      }
+#endif
+      return instantiationResult;
+    } catch (reason) {
+      // We expect the most common failure cause to be a bad MIME type for the binary,
+      // in which case falling back to ArrayBuffer instantiation should work.
+      err(`wasm streaming compile failed: ${reason}`);
+      err('falling back to ArrayBuffer instantiation');
+      // fall back of instantiateArrayBuffer below
+    };
   }
 #endif
   return instantiateArrayBuffer(binaryFile, imports);
@@ -936,7 +913,7 @@ function getWasmImports() {
 
 // Create the wasm instance.
 // Receives the wasm imports, returns the exports.
-function createWasm() {
+{{{ asyncIf(WASM_ASYNC_COMPILATION) }}} function createWasm() {
   // Load the wasm module and create an instance of using native support in the JS engine.
   // handle a generated wasm instance, receiving its exports and
   // performing other necessary setup
@@ -1104,17 +1081,23 @@ function createWasm() {
 #if RUNTIME_DEBUG
   dbg('asynchronously preparing wasm');
 #endif
-  instantiateAsync(wasmBinary, wasmBinaryFile, info).then(receiveInstantiationResult)
 #if MODULARIZE
-  // If instantiation fails, reject the module ready promise.
-  .catch(readyPromiseReject)
+  try {
 #endif
-  ;
+    var result = await instantiateAsync(wasmBinary, wasmBinaryFile, info);
+    receiveInstantiationResult(result);
 #if LOAD_SOURCE_MAP
-  getSourceMapPromise().then(receiveSourceMapJSON);
+    receiveSourceMapJSON(await getSourceMapPromise());
 #endif
-  return {}; // no exports yet; we'll fill them in later
-#else
+    return result;
+#if MODULARIZE
+  } catch (e) {
+    // If instantiation fails, reject the module ready promise.
+    readyPromiseReject(e);
+    return;
+  }
+#endif
+#else // WASM_ASYNC_COMPILATION
   var result = instantiateSync(wasmBinaryFile, info);
 #if PTHREADS || MAIN_MODULE
   return receiveInstance(result[0], result[1]);
@@ -1124,7 +1107,7 @@ function createWasm() {
   // When the regression is fixed, we can remove this if/else.
   return receiveInstance(result[0]);
 #endif
-#endif
+#endif // WASM_ASYNC_COMPILATION
 }
 
 #if !WASM_BIGINT

src/settings.js

@@ -2186,14 +2186,6 @@ var LEGACY_RUNTIME = false;
 // [link]
 var SIGNATURE_CONVERSIONS = [];
 
-//===========================================
-// Internal, used for testing only, from here
-//===========================================
-
-// Internal (testing only): Disables the blitOffscreenFramebuffer VAO path.
-// [link]
-var OFFSCREEN_FRAMEBUFFER_FORBID_VAO_PATH = false;
-
 // For renamed settings the format is:
 // [OLD_NAME, NEW_NAME]
 // For removed settings (which now effectively have a fixed value and can no

system/lib/embind/bind.cpp

@@ -149,8 +149,6 @@ EMSCRIPTEN_BINDINGS(builtin) {
   register_float<double>("double");
 
   _embind_register_std_string(TypeID<std::string>::get(), "std::string");
-  _embind_register_std_string(
-    TypeID<std::basic_string<unsigned char>>::get(), "std::basic_string<unsigned char>");
   _embind_register_std_wstring(TypeID<std::wstring>::get(), sizeof(wchar_t), "std::wstring");
   _embind_register_std_wstring(TypeID<std::u16string>::get(), sizeof(char16_t), "std::u16string");
   _embind_register_std_wstring(TypeID<std::u32string>::get(), sizeof(char32_t), "std::u32string");