Merge branch 'main' into anonymous-file-descriptors

Author: hoodmane

.circleci/config.yml

@@ -425,6 +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
   mypy:
     executor: bionic
     steps:

.github/workflows/archive.yml

@@ -0,0 +1,66 @@
+name: CI
+
+on:
+  create:
+    tags:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  archive:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - name: make dist
+      run: |
+        make dist
+        version=`cat emscripten-version.txt | sed s/\"//g`
+        echo "VERSION=$version" >> $GITHUB_ENV
+    - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      with:
+        name: emscripten-${{ env.VERSION }}
+        path: emscripten-${{ env.VERSION }}.tar.bz2
+
+  check-expectations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # We want access to other branches, specifically `main`
+      - name: pip install
+        run: |
+          which python3
+          python3 --version
+          python3 -m pip install -r requirements-dev.txt
+      - name: Install emsdk
+        run: |
+          EM_CONFIG=$HOME/emsdk/.emscripten
+          echo $EM_CONFIG
+          echo "EM_CONFIG=$EM_CONFIG" >> $GITHUB_ENV
+          curl -# -L -o ~/emsdk-main.tar.gz https://github.com/emscripten-core/emsdk/archive/main.tar.gz
+          tar -C ~ -xf ~/emsdk-main.tar.gz
+          mv ~/emsdk-main ~/emsdk
+          cd ~/emsdk
+          ./emsdk install tot
+          ./emsdk activate tot
+          echo "JS_ENGINES = [NODE_JS]" >> $EM_CONFIG
+          echo "final config:"
+          cat $EM_CONFIG
+      - name: Check test expectations on main
+        run: |
+          git checkout origin/main
+          # Hack to honor changes to rebaseline_tests.py in the current PR
+          git checkout - ./tools/maint/rebaseline_tests.py
+          ./bootstrap
+          if ! ./tools/maint/rebaseline_tests.py --check-only; then
+            echo "Test expectations are out-of-date on the main branch."
+            echo "You can run `./tools/maint/rebaseline_tests.py --new-branch`"
+            echo "and use it to create a seperate PR."
+            exit 1
+          fi

.github/workflows/ci.yml

@@ -9,42 +9,44 @@ on:
         type: string
 
 jobs:
-    create-release:
-      runs-on: ubuntu-latest
-      steps:
-        - name: Checkout repo
-          uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-        # Updates changelog and writes the release version into the environment
-        - name: Update Changelog
-          run: python3 tools/maint/create_release.py --action
-        - name: Create Changelog PR
-          id: cpr
-          uses: peter-evans/create-pull-request@v6
-          with:
-            token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
-            title: Mark ${{ env.RELEASE_VERSION }} as released
-            team-reviewers: release-reviewers
-            delete-branch: true
-        - name: Enable auto-merge
-          run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-          env:
-            GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
-        - name: Tag release sha
-          uses: actions/github-script@v7
-          with:
-            github-token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
-            script: |
-              const tag_sha = '${{ inputs.release-sha }}';
-              const release_version = '${{ env.RELEASE_VERSION }}';
-              console.log(`Version ${release_version} at SHA ${tag_sha}`);
-              const regex = /^[0-9]+.[0-9]+.[0-9]+$/;
-              const match = release_version.match(regex);
-              if (!match) {
-                throw new Error('Malformed release version');
-              }
-              await github.rest.git.createRef({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: `refs/tags/${release_version}`,
-                sha: tag_sha
-              });
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      # Updates changelog and writes the release version into the environment
+      - name: Update Changelog
+        run: python3 tools/maint/create_release.py --action
+      - name: Create Changelog PR
+        id: cpr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
+          title: Mark ${{ env.RELEASE_VERSION }} as released
+          body: Update changelog and emscripten-version.txt [ci skip]
+          team-reviewers: release-reviewers
+          delete-branch: true
+      - name: Enable auto-merge
+        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
+      - name: Tag release sha
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
+          script: |
+            const tag_sha = '${{ inputs.release-sha }}';
+            const release_version = '${{ env.RELEASE_VERSION }}';
+            console.log(`Version ${release_version} at SHA ${tag_sha}`);
+            const regex = /^[0-9]+.[0-9]+.[0-9]+$/;
+            const match = release_version.match(regex);
+            if (!match) {
+              throw new Error('Malformed release version');
+            }
+            await github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: `refs/tags/${release_version}`,
+              sha: tag_sha
+            });
+

.github/workflows/tag-release.yml

@@ -18,18 +18,30 @@ 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)
 -----------------------
+- `PATH.basename()` no longer calls `PATH.normalize()`, so that
+  `PATH.basename("a/.")` returns `"."` instead of `"a"` and
+  `PATH.basename("a/b/..")` returns `".."` instead of `"a"`. This is in line with
+  the behaviour of both node and coreutils, and is already the case when using
+  NODERAWFS". (#23180)
+
+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)
-- 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
+  `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
 -----------------

ChangeLog.md

@@ -252,7 +252,7 @@ Options that are modified or new in *emcc* are listed below:
 "--closure 0|1|2"
    [link] Runs the *Closure Compiler*. Possible values are:
 
-      * "0": No closure compiler (default in "-O2" and below).
+      * "0": No closure compiler (default).
 
       * "1": Run closure compiler. This greatly reduces the size of
         the support JavaScript code (everything but the WebAssembly or
@@ -277,9 +277,6 @@ Options that are modified or new in *emcc* are listed below:
        before the closure-compiled code runs, because then it will
        reuse that variable.
 
-     * Closure is only run if JavaScript opts are being done ("-O2" or
-       above).
-
 "--closure-args=<args>"
    [link] Pass arguments to the *Closure compiler*. This is an
    alternative to "EMCC_CLOSURE_ARGS".

docs/emcc.txt

@@ -1268,6 +1268,13 @@ def consume_arg_file():
       if is_int(requested_level):
         # the -gX value is the debug level (-g1, -g2, etc.)
         settings.DEBUG_LEVEL = validate_arg_level(requested_level, 4, 'invalid debug level: ' + arg)
+        if settings.DEBUG_LEVEL == 0:
+          # Set these explicitly so -g0 overrides previous -g on the cmdline
+          settings.GENERATE_DWARF = 0
+          settings.GENERATE_SOURCE_MAP = 0
+          settings.EMIT_NAME_SECTION = 0
+        elif settings.DEBUG_LEVEL > 1:
+          settings.EMIT_NAME_SECTION = 1
         # if we don't need to preserve LLVM debug info, do not keep this flag
         # for clang
         if settings.DEBUG_LEVEL < 3:
@@ -1298,17 +1305,20 @@ def consume_arg_file():
           settings.GENERATE_DWARF = 1
         elif requested_level == 'source-map':
           settings.GENERATE_SOURCE_MAP = 1
+          settings.EMIT_NAME_SECTION = 1
           newargs[i] = '-g'
         else:
           # Other non-integer levels (e.g. -gline-tables-only or -gdwarf-5) are
           # usually clang flags that emit DWARF. So we pass them through to
           # clang and make the emscripten code treat it like any other DWARF.
           settings.GENERATE_DWARF = 1
+          settings.EMIT_NAME_SECTION = 1
         # In all cases set the emscripten debug level to 3 so that we do not
         # strip during link (during compile, this does not make a difference).
         settings.DEBUG_LEVEL = 3
     elif check_flag('-profiling') or check_flag('--profiling'):
       settings.DEBUG_LEVEL = max(settings.DEBUG_LEVEL, 2)
+      settings.EMIT_NAME_SECTION = 1
     elif check_flag('-profiling-funcs') or check_flag('--profiling-funcs'):
       settings.EMIT_NAME_SECTION = 1
     elif newargs[i] == '--tracing' or newargs[i] == '--memoryprofiler':

emcc.py

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

emscripten-version.txt

@@ -49,11 +49,8 @@ lint.ignore = [
   "PLW1510",
   "PLW2901",
 ]
-
 lint.per-file-ignores."emrun.py" = [ "PLE0704" ]
-
 lint.mccabe.max-complexity = 48 # Recommended: 10
-
 lint.pylint.allow-magic-value-types = [
   "bytes",
   "float",