Merge branch 'main' into Xmader/feat/url

Author: Xmader

.github/workflows/test-and-publish.yaml

@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Use Ubuntu 20.04 / macOS 12 + Python 3.10 to build SpiderMonkey
-        os: [ 'ubuntu-20.04', 'macos-12', 'm2ci' ]
+        # Use Ubuntu 20.04 / macOS 13 + Python 3.10 to build SpiderMonkey
+        os: [ 'ubuntu-20.04', 'macos-13', 'm2ci' ]
         python_version: [ '3.10' ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -40,13 +40,18 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey102.13-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Setup Poetry
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
         uses: snok/install-poetry@v1
         with:
           version: 1.5.1
+      - name: Setup XCode
+        if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
+        # SpiderMonkey 115 ESR requires XCode SDK version at least 13.3
+        # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#installed-sdks
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Build spidermonkey
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
         run: ./setup.sh
@@ -60,7 +65,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey102.13-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Setup Poetry
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -135,7 +140,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey102.13-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
           fail-on-cache-miss: true # SpiderMonkey is expected to be cached in its dedicated job
       - name: Build pminit
         run: |

cmake/modules/FindSpiderMonkey.cmake

@@ -59,7 +59,7 @@ set(SPIDERMONKEY_PATHS
 set(SPIDERMONKEY_HEADERS jsapi.h js/RequiredDefines.h)
 
 # SpiderMonkey include suffix paths
-set(SPIDERMONKEY_INCLUDE_SUFFIX_PATHS dist/include js/src include include/js include/mozjs-48a1 include/mozjs-102/)
+set(SPIDERMONKEY_INCLUDE_SUFFIX_PATHS include/mozjs-115/)
 
 # Find SpiderMonkey include path
 find_path(SPIDERMONKEY_INCLUDE_DIR ${SPIDERMONKEY_HEADERS}
@@ -70,7 +70,7 @@ find_path(SPIDERMONKEY_INCLUDE_DIR ${SPIDERMONKEY_HEADERS}
 )
 
 # SpiderMonkey libs
-set(SPIDERMONKEY_LIBRARY_NAMES libmozjs-102.so libmozjs-102.dylib mozjs-102.lib)
+set(SPIDERMONKEY_LIBRARY_NAMES libmozjs-115.so libmozjs-115.dylib mozjs-115.lib)
 
 set(SPIDERMONKEY_LIB_SUFFIX_PATHS js/src/build lib)
 

setup.sh

@@ -9,7 +9,7 @@ CPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/
 echo "Installing dependencies"
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
   sudo apt-get update --yes
-  sudo apt-get install --yes cmake doxygen graphviz llvm g++ pkg-config m4 \
+  sudo apt-get install --yes cmake doxygen graphviz llvm clang pkg-config m4 \
     wget curl python3-distutils python3-dev
 elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
   brew update || true # allow failure
@@ -28,9 +28,9 @@ poetry self add "poetry-dynamic-versioning[plugin]"
 echo "Done installing dependencies"
 
 echo "Downloading spidermonkey source code"
-wget -c -q https://ftp.mozilla.org/pub/firefox/releases/102.13.0esr/source/firefox-102.13.0esr.source.tar.xz
+wget -c -q https://ftp.mozilla.org/pub/firefox/releases/115.1.0esr/source/firefox-115.1.0esr.source.tar.xz
 mkdir -p firefox-source
-tar xf firefox-102.13.0esr.source.tar.xz -C firefox-source --strip-components=1 # strip the root folder
+tar xf firefox-115.1.0esr.source.tar.xz -C firefox-source --strip-components=1 # strip the root folder
 echo "Done downloading spidermonkey source code"
 
 echo "Building spidermonkey"
@@ -39,11 +39,10 @@ cd firefox-source
 sed -i'' -e 's/os not in ("WINNT", "OSX", "Android")/os not in ("WINNT", "Android")/' ./build/moz.configure/pkg.configure # use pkg-config on macOS
 sed -i'' -e '/"WindowsDllMain.cpp"/d' ./mozglue/misc/moz.build # https://discourse.mozilla.org/t/105671, https://bugzilla.mozilla.org/show_bug.cgi?id=1751561
 sed -i'' -e '/"winheap.cpp"/d' ./memory/mozalloc/moz.build # https://bugzilla.mozilla.org/show_bug.cgi?id=1802675
+sed -i'' -e 's/"install-name-tool"/"install_name_tool"/' ./moz.configure # `install-name-tool` does not exist, but we have `install_name_tool`
 sed -i'' -e 's/bool Unbox/JS_PUBLIC_API bool Unbox/g' ./js/public/Class.h           # need to manually add JS_PUBLIC_API to js::Unbox until it gets fixed in Spidermonkey
 sed -i'' -e 's/bool js::Unbox/JS_PUBLIC_API bool js::Unbox/g' ./js/src/vm/JSObject.cpp  # same here
 cd js/src
-cp ./configure.in ./configure
-chmod +x ./configure
 mkdir -p _build
 cd _build
 mkdir -p ../../../../_spidermonkey_install/

src/modules/pythonmonkey/pythonmonkey.cc

@@ -253,6 +253,9 @@ static PyObject *eval(PyObject *self, PyObject *args) {
   js::ESClass cls = js::ESClass::Other;   // placeholder if `rval` is not a JSObject
   if (rval->isObject()) {
     JS::GetBuiltinClass(GLOBAL_CX, JS::RootedObject(GLOBAL_CX, &rval->toObject()), &cls);
+    if (JS_ObjectIsBoundFunction(&rval->toObject())) {
+      cls = js::ESClass::Function; // In SpiderMonkey 115 ESR, bound function is no longer a JSFunction but a js::BoundFunctionObject.
+    }
   }
   bool rvalIsFunction = cls == js::ESClass::Function;   // function object
   bool rvalIsString = rval->isString() || cls == js::ESClass::String;   // string primitive or boxed String object

src/pyTypeFactory.cc

@@ -106,6 +106,10 @@ PyType *pyTypeFactory(JSContext *cx, JS::Rooted<JSObject *> *thisObj, JS::Rooted
     }
     js::ESClass cls;
     JS::GetBuiltinClass(cx, obj, &cls);
+    if (JS_ObjectIsBoundFunction(obj)) {
+      cls = js::ESClass::Function; // In SpiderMonkey 115 ESR, bound function is no longer a JSFunction but a js::BoundFunctionObject.
+                                   // js::ESClass::Function only assigns to JSFunction objects by JS::GetBuiltinClass.
+    }
     switch (cls) {
     case js::ESClass::Boolean: {
         // TODO (Caleb Aikens): refactor out all `js::Unbox` calls