Merge branch 'main' into cw-audio-memory64

Author: cwoffenden

ChangeLog.md

@@ -20,6 +20,11 @@ See docs/process.md for more on how version tagging works.
 
 4.0.2 (in development)
 ----------------------
+- The standard Wasm EH, enabled by `-sWASM_LEGACY_EXCEPTIONS=0`, now uses the
+  LLVM backend implementation rather than the previously used Binaryen
+  translator
+  (https://github.com/WebAssembly/binaryen/blob/main/src/passes/TranslateEH.cpp).
+  (#23469) No specific action from the user is required.
 - Added support for compiling AVX2 intrinsics, 256-bit wide intrinsic is emulated
   on top of 128-bit Wasm SIMD instruction set. (#23035). Pass `-msimd128 -mavx2`
   to enable targeting AVX2.

embuilder.py

@@ -32,6 +32,7 @@
 MINIMAL_TASKS = [
     'libcompiler_rt',
     'libcompiler_rt-legacysjlj',
+    'libcompiler_rt-wasmsjlj',
     'libcompiler_rt-ww',
     'libc',
     'libc-debug',
@@ -40,13 +41,16 @@
     'libc_optz-debug',
     'libc++abi',
     'libc++abi-legacyexcept',
+    'libc++abi-wasmexcept',
     'libc++abi-noexcept',
     'libc++abi-debug',
     'libc++abi-debug-legacyexcept',
+    'libc++abi-debug-wasmexcept',
     'libc++abi-debug-noexcept',
     'libc++abi-debug-ww-noexcept',
     'libc++',
     'libc++-legacyexcept',
+    'libc++-wasmexcept',
     'libc++-noexcept',
     'libc++-ww-noexcept',
     'libal',
@@ -80,6 +84,7 @@
     'crt1_proxy_main',
     'crtbegin',
     'libunwind-legacyexcept',
+    'libunwind-wasmexcept',
     'libnoexit',
     'sqlite3',
     'sqlite3-mt',

site/source/docs/tools_reference/settings_reference.rst

@@ -1165,6 +1165,8 @@ https://github.com/WebAssembly/exception-handling/blob/main/proposals/exception-
 If false, emit instructions for the standardized exception handling proposal:
 https://github.com/WebAssembly/exception-handling/blob/main/proposals/exception-handling/Exceptions.md
 
+.. note:: Applicable during both linking and compilation
+
 Default value: true
 
 .. _nodejs_catch_exit:

src/cpuprofiler.js

@@ -225,7 +225,7 @@ var emscriptenCpuProfiler = {
           if (i != 2) cs += ' <- ';
           var fn = funcs[i];
           var at = fn.indexOf('@');
-          if (at != -1) fn = fn.substr(0, at);
+          if (at != -1) fn = fn.slice(0, at);
           fn = fn.trim();
           cs += '"' + fn + '"';
         }

src/emrun_prejs.js

@@ -9,7 +9,7 @@
 
 // Route URL GET parameters to argc+argv
 if (typeof window == 'object') {
-  Module['arguments'] = window.location.search.substr(1).trim().split('&');
+  Module['arguments'] = window.location.search.slice(1).trim().split('&');
   for (let i = 0; i < Module['arguments'].length; ++i) {
     Module['arguments'][i] = decodeURI(Module['arguments'][i]);
   }

src/lib/libbootstrap.js

@@ -43,7 +43,7 @@ addToLibrary({
     // extra effort to support printf, even without a filesystem. very partial, very hackish
     var result = formatString(format, varargs);
     var string = intArrayToString(result);
-    if (string[string.length-1] === '\n') string = string.substr(0, string.length-1); // remove a final \n, as Module.print will do that
+    if (string.endsWith('\n')) string = string.slice(0, -1); // remove a final \n, as Module.print will do that
     out(string);
     return result.length;
   },
@@ -52,8 +52,8 @@ addToLibrary({
   puts: (s) => {
     // extra effort to support puts, even without a filesystem. very partial, very hackish
     var result = UTF8ToString(s);
-    var string = result.substr(0);
-    if (string[string.length-1] === '\n') string = string.substr(0, string.length-1); // remove a final \n, as Module.print will do that
+    var string = result;
+    if (string.endsWith('\n')) string = string.slice(0, -1); // remove a final \n, as Module.print will do that
     out(string);
     return result.length;
   },

src/lib/libbrowser.js

@@ -88,7 +88,7 @@ var LibraryBrowser = {
 
       var audioPlugin = {};
       audioPlugin['canHandle'] = function audioPlugin_canHandle(name) {
-        return !Module['noAudioDecoding'] && name.substr(-4) in { '.ogg': 1, '.wav': 1, '.mp3': 1 };
+        return !Module['noAudioDecoding'] && name.slice(-4) in { '.ogg': 1, '.wav': 1, '.mp3': 1 };
       };
       audioPlugin['handle'] = function audioPlugin_handle(byteArray, name, onload, onerror) {
         var done = false;
@@ -138,7 +138,7 @@ var LibraryBrowser = {
             }
             return ret;
           }
-          audio.src = 'data:audio/x-' + name.substr(-3) + ';base64,' + encode64(byteArray);
+          audio.src = 'data:audio/x-' + name.slice(-3) + ';base64,' + encode64(byteArray);
           finish(audio); // we don't wait for confirmation this worked - but it's worth trying
         };
         audio.src = url;
@@ -348,7 +348,7 @@ var LibraryBrowser = {
         'ogg': 'audio/ogg',
         'wav': 'audio/wav',
         'mp3': 'audio/mpeg'
-      }[name.substr(name.lastIndexOf('.')+1)];
+      }[name.slice(name.lastIndexOf('.')+1)];
     },
 
     getUserMedia(func) {
@@ -552,7 +552,7 @@ var LibraryBrowser = {
       }
       var w = wNative;
       var h = hNative;
-      if (Module['forcedAspectRatio'] && Module['forcedAspectRatio'] > 0) {
+      if (Module['forcedAspectRatio'] > 0) {
         if (w/h < Module['forcedAspectRatio']) {
           w = Math.round(h * Module['forcedAspectRatio']);
         } else {
@@ -732,7 +732,7 @@ var LibraryBrowser = {
     var styleSheet = document.styleSheets[0];
     var rules = styleSheet.cssRules;
     for (var i = 0; i < rules.length; i++) {
-      if (rules[i].cssText.substr(0, 6) == 'canvas') {
+      if (rules[i].cssText.startsWith('canvas')) {
         styleSheet.deleteRule(i);
         i--;
       }

src/lib/libc_preprocessor.js

@@ -96,7 +96,7 @@ addToLibrary({
           }
         } else if (kind == 1/*operator symbol*/) {
           // Lookahead for two-character operators.
-          var op2 = exprString.substr(i, 2);
+          var op2 = exprString.slice(i, i + 2);
           if (['<=', '>=', '==', '!=', '&&', '||'].includes(op2)) {
             out.push(op2);
             ++i;

src/lib/libembind_shared.js

@@ -128,9 +128,9 @@ var LibraryEmbindShared = {
     const argsIndex = signature.indexOf("(");
     if (argsIndex !== -1) {
 #if ASSERTIONS
-      assert(signature[signature.length - 1] == ")", "Parentheses for argument names should match.");
+      assert(signature.endsWith(")"), "Parentheses for argument names should match.");
 #endif
-      return signature.substr(0, argsIndex);
+      return signature.slice(0, argsIndex);
     } else {
       return signature;
     }
@@ -141,9 +141,9 @@ var LibraryEmbindShared = {
     const argsIndex = signature.indexOf("(") + 1;
     if (argsIndex !== 0) {
 #if ASSERTIONS
-      assert(signature[signature.length - 1] == ")", "Parentheses for argument names should match.");
+      assert(signature.endsWith(")"), "Parentheses for argument names should match.");
 #endif
-      return signature.substr(argsIndex, signature.length - argsIndex - 1).replaceAll(" ", "").split(",").filter(n => n.length);
+      return signature.slice(argsIndex, -1).replaceAll(" ", "").split(",").filter(n => n.length);
     } else {
       return [];
     }

src/lib/libeventloop.js

@@ -489,7 +489,7 @@ LibraryJSEventLoop = {
     }
 
     if (!noSetTiming) {
-      if (fps && fps > 0) {
+      if (fps > 0) {
         _emscripten_set_main_loop_timing({{{ cDefs.EM_TIMING_SETTIMEOUT }}}, 1000.0 / fps);
       } else {
         // Do rAF by rendering each frame (no decimating)