Upgrade to SpiderMonkey 140 (#607)

* Update SpiderMonkey

Signed-off-by: Josh Matthews <[email protected]>

* Update patches.

Signed-off-by: Josh Matthews <[email protected]>

* Apply patches.

Signed-off-by: Josh Matthews <[email protected]>

* Update jsglue.

Signed-off-by: Josh Matthews <[email protected]>

* Update wrappers.

Signed-off-by: Josh Matthews <[email protected]>

* Update README.

Signed-off-by: Josh Matthews <[email protected]>

* Update package version.

Signed-off-by: Josh Matthews <[email protected]>

* Wrap new Dispatchable ownership in a layer of opaque pointers.

Signed-off-by: Josh Matthews <[email protected]>

* Upgrade NDK to 28b.

Signed-off-by: Josh Matthews <[email protected]>

* Format jsglue.

Signed-off-by: Josh Matthews <[email protected]>

* Fetch mozjs source from github release. Reenable integrity check.

Signed-off-by: Josh Matthews <[email protected]>

* Update upgrade steps in README for new integrity job requirements.

Signed-off-by: Josh Matthews <[email protected]>

* Show git diff when integrity check fails.

Signed-off-by: Josh Matthews <[email protected]>

* Remove vendored jinja2 module.

Signed-off-by: Josh Matthews <[email protected]>

* Update jinja2 removal patch to use lowercase directory name.

Signed-off-by: Josh Matthews <[email protected]>

* Address review comments.

Signed-off-by: Josh Matthews <[email protected]>

* Fix documentation.

Signed-off-by: Josh Matthews <[email protected]>

---------

Signed-off-by: Josh Matthews <[email protected]>

Author: jdm

.github/workflows/build.yml

@@ -189,7 +189,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r28
+          ndk-version: r28b
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         id: toolchain
@@ -285,21 +285,21 @@ jobs:
         with:
           clang-format-version: "18"
           exclude-regex: mozjs-sys\/mozjs
-      #- name: Get mozjs
-      #  run: |
-      #    bash ./mozjs-sys/etc/get_mozjs.sh
-      #- name: Apply patch
-      #  run: |
-      #    python3 ./mozjs-sys/etc/update.py --no-commit mozjs.tar.xz
-      #    # Run `git add` here to force CRLF converted into LF
-      #    # so that we can check diff properly in next run
-      #    git add --all mozjs-sys
-      #- name: Check patch integrity
-      #  working-directory: ./mozjs-sys
-      #  # Because we've added files in previous run, we need to
-      #  # check diff with `--staged`.
-      #  run: |
-      #    git diff --staged --no-ext-diff --quiet --exit-code
+      - name: Get mozjs
+        run: |
+          bash ./mozjs-sys/etc/get_mozjs.sh
+      - name: Apply patch
+        run: |
+          python3 ./mozjs-sys/etc/update.py --no-commit mozjs.tar.xz
+          # Run `git add` here to force CRLF converted into LF
+          # so that we can check diff properly in next run
+          git add --all mozjs-sys
+      - name: Check patch integrity
+        working-directory: ./mozjs-sys
+        # Because we've added files in previous run, we need to
+        # check diff with `--staged`.
+        run: |
+          git diff --staged --no-ext-diff --exit-code
       - name: Detect need for mozjs-sys version bump
         if: ${{ github.event_name == 'pull_request' }}
         id: changes

README.md

@@ -6,8 +6,8 @@ that are battle-tested in [Servo](https://servo.org/), split in two crates:
 - `mozjs-sys`:  SpiderMonkey and low-level Rust bindings to its C++ API.
 - `mozjs`: Higher-level bindings to the SpiderMonkey API.
 
-Mozjs is currently tracking SpiderMonkey on [mozilla-release](https://searchfox.org/mozilla-release/source/) branch
-(currently version 137.0).
+Mozjs is currently tracking SpiderMonkey on [mozilla-esr140](https://searchfox.org/mozilla-esr140/source/) branch
+(currently version 140.0).
 
 ## Building from Pre-built Archive
 
@@ -159,7 +159,11 @@ In order to upgrade to a new version of SpiderMonkey:
 
 6. Run `./mozjs/src/generate_wrappers.sh` to regenerate wrappers.
 
-7. Build and test the bindings as above, then submit a PR!
+7. Build and test the bindings as above.
+
+8. Create a new release on github with the .tar.xz that you saved earlier. Name the new tag `mozjs-source-${COMMIT}` where `${COMMIT}` is the value stored in `mozjs/etc/COMMIT`.
+
+9. Submit a PR!
 
 8. Send companion PR to servo, as SpiderMonkey bump PR will not be merged
 until it's tested against servo.

mozjs-sys/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.137.0-3"
+version = "0.140.0-0"
 authors = ["Mozilla"]
 links = "mozjs"
 license.workspace = true

mozjs-sys/etc/COMMIT

@@ -1 +1 @@
-7a8941c8c2cbdd3a4d352d8b732f7b5eeefbfd2d
+19b003833fc9bb146efa9bc665a536765e8899d1

mozjs-sys/etc/filters.txt

@@ -33,5 +33,9 @@
 - /Cargo.toml
 - /modules/zlib
 
+# Remove unused python dependency that also causes problems with case-sensitive filesystems.
+- /third_party/python/Jinja2
+- /third_party/python/jinja2
+
 # Include the rest.
 + /*

mozjs-sys/etc/get_mozjs.sh

@@ -4,16 +4,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-REPO=mozilla-release
-
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-# get commit and appropriet mozjs tar
+# get commit and appropriate mozjs tar
 COMMIT=$( cat $SCRIPT_DIR/COMMIT )
 echo "Commit $COMMIT"
-job_id=$(curl "https://treeherder.mozilla.org/api/project/$REPO/push/?revision=$COMMIT" | jq '.results[0].id')
-echo "Job id $job_id"
-task_id=$(curl "https://treeherder.mozilla.org/api/jobs/?push_id=$job_id" | jq -r '.results[] | select(.[] == "spidermonkey-sm-package-linux64/opt") | .[14]')
-echo "Task id $task_id"
-tar_file=$(curl "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts" | jq -r '.artifacts[] | select(.name | contains("tar.xz")) | .name')
-echo "Tar at https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts/$tar_file"
-curl -L --output mozjs.tar.xz "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts/$tar_file"
+tar_file=$(curl -L -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/servo/mozjs/releases/tags/mozjs-source-$COMMIT | jq -r '.assets[] | select(.name | contains("tar.xz")) | .browser_download_url')
+echo "Tar at $tar_file"
+curl -L --output mozjs.tar.xz $tar_file

mozjs-sys/etc/get_taskcluster_mozjs.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO=mozilla-release
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+# get commit and appropriate mozjs tar
+COMMIT=$( cat $SCRIPT_DIR/COMMIT )
+echo "Commit $COMMIT"
+job_id=$(curl "https://treeherder.mozilla.org/api/project/$REPO/push/?revision=$COMMIT" | jq '.results[0].id')
+echo "Job id $job_id"
+task_id=$(curl "https://treeherder.mozilla.org/api/jobs/?push_id=$job_id" | jq -r '.results[] | select(.[] == "spidermonkey-sm-package-linux64/opt") | .[14]')
+echo "Task id $task_id"
+tar_file=$(curl "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts" | jq -r '.artifacts[] | select(.name | contains("tar.xz")) | .name')
+echo "Tar at https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts/$tar_file"
+curl -L --output mozjs.tar.xz "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$task_id/runs/0/artifacts/$tar_file"

mozjs-sys/etc/patches/0032-macos-sdk-min-14-2.patch

@@ -6,7 +6,7 @@ index 8a97d952d..5b538f0a1 100755
      )
 
      def mac_sdk_min_version():
--        return "15.2"
+-        return "15.4"
 +        return "14.2"
 
      @depends(

mozjs-sys/etc/patches/0033-no-zlib.patch

@@ -61,7 +61,7 @@ index 804b9a375..87ccc508d 100755
 -
 -option(
 -    env="USE_LIBZ_RS",
--    default=milestone.is_nightly,
+-    default=milestone.is_early_beta_or_earlier,
 -    help="Use libz-rs-sys instead of zlib",
 -    when=toolkit & ~with_system_zlib_option,
 -)

mozjs-sys/etc/patches/0038-more-bindgen-fixes.patch

@@ -2,12 +2,11 @@ diff --git a/js/public/CompileOptions.h b/js/public/CompileOptions.h
 index 810f5e29e..e6b7ab797 100644
 --- a/js/public/CompileOptions.h
 +++ b/js/public/CompileOptions.h
-@@ -123,7 +123,7 @@ class JS_PUBLIC_API ReadOnlyDecodeOptions;
+@@ -123,6 +123,6 @@ class JS_PUBLIC_API ReadOnlyDecodeOptions;
 
  // Compilation-specific part of JS::ContextOptions which is supposed to be
  // configured by user prefs.
 -class JS_PUBLIC_API PrefableCompileOptions {
 +class JS_PUBLIC_API __attribute__((__packed__)) PrefableCompileOptions {
   public:
    PrefableCompileOptions()
-       : importAttributes_(false),