Merge branch 'main' into cw-audio-tweaks-3

Author: cwoffenden

.circleci/config.yml

@@ -425,8 +425,8 @@ jobs:
       - checkout
       - pip-install
       - run: ruff check
-      # TODO (cclauss): When ruff supports rule E303 without --preview, remove following line
-      - run: ruff check --preview --select=E303
+      # TODO (cclauss): When ruff supports rules E20,E30 without --preview, remove following line
+      - run: ruff check --preview --select=E20,E30
   mypy:
     executor: focal
     steps:
@@ -642,7 +642,7 @@ jobs:
       # version of node (node canary) when running the compiler output (e.g.
       # in configure tests.
       - run:
-          name: configure node canary
+          name: configure compiler to use node-canary
           command: echo "NODE_JS = NODE_JS_TEST" >> ~/emsdk/.emscripten
       - run-tests:
           title: "wasm64"
@@ -746,6 +746,18 @@ jobs:
           command: git submodule update --init
       - pip-install
       - install-emsdk
+      # `install-node-version` only changes the NODE_JS_TEST (the version of
+      # node used to run test), not NODE_JS (the version of node used to run the
+      # compiler itself).
+      # In order to test that the compiler itself can run under the oldest
+      # supported version of node, we run all the tests in the runner under that
+      # version.
+      # Keep this in sync with MINIMUM_NODE_VERSION in tools/shared.py.
+      - install-node-version:
+          node_version: "18.0.0"
+      - run:
+          name: configure compiler to use 18.0.0
+          command: echo "NODE_JS = '$(which node)'" >> ~/emsdk/.emscripten
       - install-node-canary
       - run-tests:
           title: "node (canary)"
@@ -760,7 +772,8 @@ jobs:
             core0.test_async_ccall_promise_exit_runtime_jspi
             core0.test_cubescript_jspi"
       # Run some basic tests with the minimum version of node that we currently
-      # support.
+      # support in the generated code.
+      # Keep this in sync with `OLDEST_SUPPORTED_NODE` in `feature_matrix.py`
       - install-node-version:
           node_version: "10.19.0"
       - run-tests:

ChangeLog.md

@@ -4,7 +4,7 @@ Note that version numbers do not necessarily reflect the amount of changes
 between versions. A version number reflects a release that is known to pass all
 tests, and versions may be tagged more or less frequently at different times.
 
-nNote that there is *no* ABI compatibility guarantee between versions - the ABI
+Note that there is *no* ABI compatibility guarantee between versions - the ABI
 may change, so that we can keep improving and optimizing it. The compiler will
 automatically invalidate system caches when the version number updates, so that
 libc etc. are rebuilt for you. You should also rebuild object files and
@@ -20,6 +20,9 @@ See docs/process.md for more on how version tagging works.
 
 4.0.1 (in development)
 ----------------------
+- The minimum version of node required to run emscripten was bumped from v16.20
+  to v18.  Version 4.0 was mistakenly shipped with a change that required v20,
+  but that was reverted. (#23410)
 
 4.0.0 - 01/14/25
 ----------------

emcc.py

@@ -644,7 +644,7 @@ def run(args):
     print(compiler_rt.get_path(absolute=True))
     return 0
 
-  print_file_name = [a for a in newargs if a.startswith('-print-file-name=') or a.startswith('--print-file-name=')]
+  print_file_name = [a for a in newargs if a.startswith(('-print-file-name=', '--print-file-name='))]
   if print_file_name:
     libname = print_file_name[-1].split('=')[1]
     system_libpath = cache.get_lib_dir(absolute=True)
@@ -1541,7 +1541,7 @@ def parse_value(text, expected_type):
   # places here.
   def parse_string_value(text):
     first = text[0]
-    if first == "'" or first == '"':
+    if first in {"'", '"'}:
       text = text.rstrip()
       if text[-1] != text[0] or len(text) < 2:
          raise ValueError(f'unclosed quoted string. expected final character to be "{text[0]}" and length to be greater than 1 in "{text[0]}"')
@@ -1558,7 +1558,7 @@ def parse_string_list_members(text):
       if not len(current):
         raise ValueError('empty value in string list')
       first = current[0]
-      if not (first == "'" or first == '"'):
+      if first not in {"'", '"'}:
         result.append(current.rstrip())
       else:
         start = index

emrun.py

@@ -817,7 +817,7 @@ def find_gpu_model(model):
         return gpu
     return None
 
-  for i in range(0, 16):
+  for i in range(16):
     try:
       hHardwareReg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'HARDWARE')
       hDeviceMapReg = winreg.OpenKey(hHardwareReg, 'DEVICEMAP')
@@ -1398,7 +1398,7 @@ def get_system_info(format_json):
       if len(gpus) == 1:
         info += 'GPU: ' + gpus[0]['model'] + ' with ' + str(gpus[0]['ram'] // 1024 // 1024) + " MB of VRAM\n"
       elif len(gpus) > 1:
-        for i in range(0, len(gpus)):
+        for i in range(len(gpus)):
           info += 'GPU' + str(i) + ": " + gpus[i]['model'] + ' with ' + str(gpus[i]['ram'] // 1024 // 1024) + ' MBs of VRAM\n'
       info += 'UUID: ' + unique_system_id
       return info.strip()
@@ -1427,7 +1427,6 @@ def list_processes_by_name(exe_full_path):
   except Exception:
     # Fail gracefully if psutil not available
     logv('import psutil failed, unable to detect browser processes')
-    pass
 
   logv('Searching for processes by full path name "' + exe_full_path + '".. found ' + str(len(pids)) + ' entries')
 
@@ -1637,15 +1636,15 @@ def run(args):  # noqa: C901, PLR0912, PLR0915
     file_to_serve = options.serve
   else:
     file_to_serve = '.'
-  file_to_serve_is_url = file_to_serve.startswith('file://') or file_to_serve.startswith('http://') or file_to_serve.startswith('https://')
+  file_to_serve_is_url = file_to_serve.startswith(('file://', 'http://', 'https://'))
 
   if options.serve_root:
     serve_dir = os.path.abspath(options.serve_root)
   else:
     if file_to_serve == '.' or file_to_serve_is_url:
       serve_dir = os.path.abspath('.')
     else:
-      if file_to_serve.endswith('/') or file_to_serve.endswith('\\') or os.path.isdir(file_to_serve):
+      if file_to_serve.endswith(('/', '\\')) or os.path.isdir(file_to_serve):
         serve_dir = file_to_serve
       else:
         serve_dir = os.path.dirname(os.path.abspath(file_to_serve))
@@ -1684,7 +1683,7 @@ def run(args):  # noqa: C901, PLR0912, PLR0915
         return 1
       elif options.browser == 'firefox':
         browser_app = 'org.mozilla.firefox/org.mozilla.gecko.BrowserApp'
-      elif options.browser == 'firefox_nightly' or options.browser == 'fenix':
+      elif options.browser in {'firefox_nightly', 'fenix'}:
         browser_app = 'org.mozilla.fenix/org.mozilla.gecko.BrowserApp'
       elif options.browser == 'chrome':
         browser_app = 'com.android.chrome/com.google.android.apps.chrome.Main'

eslint.config.mjs

@@ -1,13 +1,23 @@
 import globals from 'globals';
 import js from '@eslint/js';
 import { FlatCompat } from '@eslint/eslintrc';
+import { loadDefaultSettings } from './src/utility.mjs';
 
 const compat = new FlatCompat({
   baseDirectory: import.meta.dirname,
   recommendedConfig: js.configs.recommended,
   allConfig: js.configs.all
 });
 
+
+// Emscripten settings are made available to the compiler as global
+// variables.  Make sure eslint knows about them.
+const settings = loadDefaultSettings();
+const settingsGlobals = {};
+for (const name of Object.keys(settings)) {
+  settingsGlobals[name] = 'writable';
+}
+
 export default [{
   ignores: [
     '**/out/',
@@ -56,9 +66,10 @@ export default [{
     globals: {
       ...globals.browser,
       ...globals.node,
+      ...settingsGlobals,
     },
 
-    ecmaVersion: 13,
+    ecmaVersion: 'latest',
     sourceType: 'module',
   },
 
@@ -77,6 +88,7 @@ export default [{
   files: ['**/*.mjs'],
 
   rules: {
+    'no-undef': 'error',
     'no-unused-vars': ['error', {
       vars: 'all',
       args: 'none',

pyproject.toml

@@ -20,6 +20,7 @@ lint.select = [
   "E",
   "F",
   "PERF",
+  "PIE",
   "PL",
   "W",
   "YTT",
@@ -42,7 +43,6 @@ lint.ignore = [
   "PERF203",
   "PERF401",
   "PLR1704",
-  "PLR1714",
   "PLR5501",
   "PLW0602",
   "PLW0603",

requirements-dev.txt

@@ -6,7 +6,7 @@
 
 coverage[toml]==5.5
 mypy==0.971
-ruff==0.8.2
+ruff==0.9.1
 types-requests==2.27.14
 unittest-xml-reporting==3.1.0
 

src/compiler.mjs

@@ -7,11 +7,16 @@
 
 // LLVM => JavaScript compiler, main entry point
 
-import {Benchmarker, applySettings, assert, loadSettingsFile, printErr, read} from './utility.mjs';
-
-// Load default settings
-loadSettingsFile('settings.js');
-loadSettingsFile('settings_internal.js');
+import {
+  Benchmarker,
+  applySettings,
+  assert,
+  loadDefaultSettings,
+  printErr,
+  read,
+} from './utility.mjs';
+
+loadDefaultSettings();
 
 const argv = process.argv.slice(2);
 const symbolsOnlyArg = argv.indexOf('--symbols-only');

src/parseTools.mjs

@@ -893,23 +893,6 @@ function buildStringArray(array) {
   }
 }
 
-function _asmjsDemangle(symbol) {
-  if (symbol.startsWith('dynCall_')) {
-    return symbol;
-  }
-  // Strip leading "_"
-  assert(symbol.startsWith('_'), `expected mangled symbol: ${symbol}`);
-  return symbol.substr(1);
-}
-
-// TODO(sbc): Remove this function along with _asmjsDemangle.
-function hasExportedFunction(func) {
-  warnOnce(
-    'hasExportedFunction has been replaced with hasExportedSymbol, which takes and unmangled (no leading underscore) symbol name',
-  );
-  return WASM_EXPORTS.has(_asmjsDemangle(func));
-}
-
 function hasExportedSymbol(sym) {
   return WASM_EXPORTS.has(sym);
 }
@@ -1109,7 +1092,6 @@ addToCompileTimeContext({
   getNativeTypeSize,
   getPerformanceNow,
   getUnsharedTextDecoderView,
-  hasExportedFunction,
   hasExportedSymbol,
   implicitSelf,
   isSymbolNeeded,

src/parseTools_legacy.mjs

@@ -7,15 +7,6 @@
 import {warn, addToCompileTimeContext} from './utility.mjs';
 import {ATMAINS, POINTER_SIZE, runIfMainThread} from './parseTools.mjs';
 
-// Takes a pair of return values, stashes one in tempRet0 and returns the other.
-// Should probably be renamed to `makeReturn64` but keeping this old name in
-// case external JS library code uses this name.
-function makeStructuralReturn(values) {
-  warn('use of legacy parseTools function: makeStructuralReturn');
-  assert(values.length == 2);
-  return 'setTempRet0(' + values[1] + '); return ' + asmCoercion(values[0], 'i32');
-}
-
 // Replaced (at least internally) with receiveI64ParamAsI53 that does
 // bounds checking.
 function receiveI64ParamAsDouble(name) {
@@ -42,44 +33,18 @@ function makeMalloc(source, param) {
   return `_malloc(${param})`;
 }
 
-function getNativeFieldSize(type) {
-  warn('use of legacy parseTools function: getNativeFieldSize');
-  return Math.max(getNativeTypeSize(type), POINTER_SIZE);
-}
-
 const Runtime = {
-  getNativeFieldSize,
   POINTER_SIZE,
   QUANTUM_SIZE: POINTER_SIZE,
 };
 
-function addAtMain(code) {
-  warn('use of legacy parseTools function: addAtMain');
-  assert(HAS_MAIN, 'addAtMain called but program has no main function');
-  ATMAINS.push(code);
-}
-
-function ensureValidFFIType(type) {
-  return type === 'float' ? 'double' : type; // ffi does not tolerate float XXX
-}
-
-// FFI return values must arrive as doubles, and we can force them to floats afterwards
-function asmFFICoercion(value, type) {
-  value = asmCoercion(value, ensureValidFFIType(type));
-  if (type === 'float') value = asmCoercion(value, 'float');
-  return value;
-}
-
 // Legacy name for runIfMainThread.
 const runOnMainThread = runIfMainThread;
 
 addToCompileTimeContext({
   ATMAINS,
   Runtime,
-  addAtMain,
-  asmFFICoercion,
   makeMalloc,
-  makeStructuralReturn,
   receiveI64ParamAsDouble,
   receiveI64ParamAsI32s,
   runOnMainThread,