Merge branch 'main' into fix/ubsan/exceptions-111178

Author: picnixz

.github/workflows/build.yml

@@ -231,10 +231,14 @@ jobs:
     name: >-
       Ubuntu
       ${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
+      ${{ fromJSON(matrix.bolt) && '(bolt)' || '' }}
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     strategy:
       matrix:
+        bolt:
+        - false
+        - true
         free-threading:
         - false
         - true
@@ -246,9 +250,16 @@ jobs:
         exclude:
         - os: ubuntu-24.04-aarch64
           is-fork: true
+        # Do not test BOLT with free-threading, to conserve resources
+        - bolt: true
+          free-threading: true
+        # BOLT currently crashes during instrumentation on aarch64
+        - os: ubuntu-24.04-aarch64
+          bolt: true
     uses: ./.github/workflows/reusable-ubuntu.yml
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
+      bolt-optimizations: ${{ matrix.bolt }}
       free-threading: ${{ matrix.free-threading }}
       os: ${{ matrix.os }}
 

.github/workflows/reusable-ubuntu.yml

@@ -6,6 +6,11 @@ on:
       config_hash:
         required: true
         type: string
+      bolt-optimizations:
+        description: Whether to enable BOLT optimizations
+        required: false
+        type: boolean
+        default: false
       free-threading:
         description: Whether to use free-threaded mode
         required: false
@@ -34,6 +39,12 @@ jobs:
       run: echo "::add-matcher::.github/problem-matchers/gcc.json"
     - name: Install dependencies
       run: sudo ./.github/workflows/posix-deps-apt.sh
+    - name: Install Clang and BOLT
+      if: ${{ fromJSON(inputs.bolt-optimizations) }}
+      run: |
+        sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 19
+        sudo apt-get install bolt-19
+        echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV
     - name: Configure OpenSSL env vars
       run: |
         echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
@@ -73,14 +84,18 @@ jobs:
         key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
     - name: Configure CPython out-of-tree
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
+      # `test_unpickle_module_race` writes to the source directory, which is
+      # read-only during builds — so we exclude it from profiling with BOLT.
       run: >-
+        PROFILE_TASK='-m test --pgo --ignore test_unpickle_module_race'
         ../cpython-ro-srcdir/configure
         --config-cache
         --with-pydebug
         --enable-slower-safety
         --enable-safety
         --with-openssl="$OPENSSL_DIR"
         ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
+        ${{ fromJSON(inputs.bolt-optimizations) && '--enable-bolt' || '' }}
     - name: Build CPython out-of-tree
       if: ${{ inputs.free-threading }}
       working-directory: ${{ env.CPYTHON_BUILDDIR }}

Doc/c-api/sys.rst

@@ -234,7 +234,7 @@ Operating System Utilities
 
    The caller must hold the GIL.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
 
 .. c:function:: int Py_fclose(FILE *file)
@@ -246,7 +246,7 @@ Operating System Utilities
    In either case, any further access (including another call to
    :c:func:`Py_fclose`) to the stream results in undefined behavior.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
 
 .. _systemfunctions:

Doc/glossary.rst

@@ -115,7 +115,7 @@ Glossary
       :keyword:`yield` expression.
 
       Each :keyword:`yield` temporarily suspends processing, remembering the
-      location execution state (including local variables and pending
+      execution state (including local variables and pending
       try-statements).  When the *asynchronous generator iterator* effectively
       resumes with another awaitable returned by :meth:`~object.__anext__`, it
       picks up where it left off.  See :pep:`492` and :pep:`525`.
@@ -564,7 +564,7 @@ Glossary
       An object created by a :term:`generator` function.
 
       Each :keyword:`yield` temporarily suspends processing, remembering the
-      location execution state (including local variables and pending
+      execution state (including local variables and pending
       try-statements).  When the *generator iterator* resumes, it picks up where
       it left off (in contrast to functions which start fresh on every
       invocation).

Doc/library/asyncio-eventloop.rst

@@ -73,7 +73,7 @@ an event loop:
 
    Set *loop* as the current event loop for the current OS thread.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :func:`set_event_loop` function is deprecated and will be removed
       in Python 3.16.
 

Doc/library/asyncio-policy.rst

@@ -48,7 +48,7 @@ for the current process:
 
    Return the current process-wide policy.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :func:`get_event_loop_policy` function is deprecated and
       will be removed in Python 3.16.
 
@@ -58,7 +58,7 @@ for the current process:
 
    If *policy* is set to ``None``, the default policy is restored.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :func:`set_event_loop_policy` function is deprecated and
       will be removed in Python 3.16.
 
@@ -95,7 +95,7 @@ The abstract event loop policy base class is defined as follows:
 
       This method should never return ``None``.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :class:`AbstractEventLoopPolicy` class is deprecated and
       will be removed in Python 3.16.
 
@@ -121,7 +121,7 @@ asyncio ships with the following built-in policies:
       The :meth:`get_event_loop` method of the default asyncio policy now
       raises a :exc:`RuntimeError` if there is no set event loop.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :class:`DefaultEventLoopPolicy` class is deprecated and
       will be removed in Python 3.16.
 
@@ -133,7 +133,7 @@ asyncio ships with the following built-in policies:
 
    .. availability:: Windows.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :class:`WindowsSelectorEventLoopPolicy` class is deprecated and
       will be removed in Python 3.16.
 
@@ -145,7 +145,7 @@ asyncio ships with the following built-in policies:
 
    .. availability:: Windows.
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       The :class:`WindowsProactorEventLoopPolicy` class is deprecated and
       will be removed in Python 3.16.
 

Doc/library/calendar.rst

@@ -173,7 +173,7 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       on the first weekday as specified in the constructor or set by the
       :meth:`setfirstweekday` method.
 
-      .. versionchanged:: next
+      .. versionchanged:: 3.14
          If *highlight_day* is given, this date is highlighted in color.
          This can be :ref:`controlled using environment variables
          <using-on-controlling-color>`.
@@ -201,7 +201,7 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       on the first weekday as specified in the constructor or set by the
       :meth:`setfirstweekday` method.
 
-      .. versionchanged:: next
+      .. versionchanged:: 3.14
          If *highlight_day* is given, this date is highlighted in color.
          This can be :ref:`controlled using environment variables
          <using-on-controlling-color>`.
@@ -229,7 +229,7 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       :meth:`setfirstweekday` method.  The earliest year for which a calendar
       can be generated is platform-dependent.
 
-      .. versionchanged:: next
+      .. versionchanged:: 3.14
          If *highlight_day* is given, this date is highlighted in color.
          This can be :ref:`controlled using environment variables
          <using-on-controlling-color>`.
@@ -727,7 +727,7 @@ The following options are accepted:
    The number of months printed per row.
    Defaults to 3.
 
-.. versionchanged:: next
+.. versionchanged:: 3.14
    By default, today's date is highlighted in color and can be
    :ref:`controlled using environment variables <using-on-controlling-color>`.
 

Doc/library/ctypes.rst

@@ -2233,7 +2233,7 @@ Utility functions
 
    .. audit-event:: ctypes.memoryview_at address,size,readonly
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
 
 .. _ctypes-data-types:

Doc/library/faulthandler.rst

@@ -91,7 +91,7 @@ Fault handler state
       The dump now mentions if a garbage collector collection is running
       if *all_threads* is true.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.14
       Only the current thread is dumped if the :term:`GIL` is disabled to
       prevent the risk of data races.
 

Doc/library/importlib.rst

@@ -380,13 +380,15 @@ ABC hierarchy::
 
 .. class:: ResourceLoader
 
+   *Superseded by TraversableResources*
+
     An abstract base class for a :term:`loader` which implements the optional
     :pep:`302` protocol for loading arbitrary resources from the storage
     back-end.
 
     .. deprecated:: 3.7
        This ABC is deprecated in favour of supporting resource loading
-       through :class:`importlib.resources.abc.ResourceReader`.
+       through :class:`importlib.resources.abc.TraversableResources`.
 
     .. abstractmethod:: get_data(path)