Merge remote-tracking branch 'upstream/main' into gh-1359538-refactor

Author: pablogsal

.github/workflows/jit.yml

@@ -57,10 +57,9 @@ jobs:
       fail-fast: false
       matrix:
         target:
-# To re-enable later when we support these.
-#          - i686-pc-windows-msvc/msvc
-#          - x86_64-pc-windows-msvc/msvc
-#          - aarch64-pc-windows-msvc/msvc
+          - i686-pc-windows-msvc/msvc
+          - x86_64-pc-windows-msvc/msvc
+          - aarch64-pc-windows-msvc/msvc
           - x86_64-apple-darwin/clang
           - aarch64-apple-darwin/clang
           - x86_64-unknown-linux-gnu/gcc
@@ -71,16 +70,15 @@ jobs:
         llvm:
           - 21
         include:
-# To re-enable later when we support these.
-#          - target: i686-pc-windows-msvc/msvc
-#            architecture: Win32
-#            runner: windows-2022
-#          - target: x86_64-pc-windows-msvc/msvc
-#            architecture: x64
-#            runner: windows-2022
-#          - target: aarch64-pc-windows-msvc/msvc
-#            architecture: ARM64
-#            runner: windows-11-arm
+          - target: i686-pc-windows-msvc/msvc
+            architecture: Win32
+            runner: windows-2022
+          - target: x86_64-pc-windows-msvc/msvc
+            architecture: x64
+            runner: windows-2022
+          - target: aarch64-pc-windows-msvc/msvc
+            architecture: ARM64
+            runner: windows-11-arm
           - target: x86_64-apple-darwin/clang
             architecture: x86_64
             runner: macos-15-intel

Doc/c-api/float.rst

@@ -87,7 +87,7 @@ Floating-Point Objects
    ``<math.h>`` header.
 
    .. deprecated:: 3.15
-      The macro is soft deprecated.
+      The macro is :term:`soft deprecated`.
 
 
 .. c:macro:: Py_NAN
@@ -99,6 +99,14 @@ Floating-Point Objects
    the C11 standard ``<math.h>`` header.
 
 
+.. c:macro:: Py_HUGE_VAL
+
+   Equivalent to :c:macro:`!INFINITY`.
+
+   .. deprecated:: 3.14
+      The macro is :term:`soft deprecated`.
+
+
 .. c:macro:: Py_MATH_E
 
    The definition (accurate for a :c:expr:`double` type) of the :data:`math.e` constant.
@@ -147,6 +155,34 @@ Floating-Point Objects
       return PyFloat_FromDouble(copysign(INFINITY, sign));
 
 
+.. c:macro:: Py_IS_FINITE(X)
+
+   Return ``1`` if the given floating-point number *X* is finite,
+   that is, it is normal, subnormal or zero, but not infinite or NaN.
+   Return ``0`` otherwise.
+
+   .. deprecated:: 3.14
+      The macro is :term:`soft deprecated`.  Use :c:macro:`!isfinite` instead.
+
+
+.. c:macro:: Py_IS_INFINITY(X)
+
+   Return ``1`` if the given floating-point number *X* is positive or negative
+   infinity.  Return ``0`` otherwise.
+
+   .. deprecated:: 3.14
+      The macro is :term:`soft deprecated`.  Use :c:macro:`!isinf` instead.
+
+
+.. c:macro:: Py_IS_NAN(X)
+
+   Return ``1`` if the given floating-point number *X* is a not-a-number (NaN)
+   value.  Return ``0`` otherwise.
+
+   .. deprecated:: 3.14
+      The macro is :term:`soft deprecated`.  Use :c:macro:`!isnan` instead.
+
+
 Pack and Unpack functions
 -------------------------
 

Doc/library/decimal.rst

@@ -264,7 +264,7 @@ allows the settings to be changed.  This approach meets the needs of most
 applications.
 
 For more advanced work, it may be useful to create alternate contexts using the
-Context() constructor.  To make an alternate active, use the :func:`setcontext`
+:meth:`Context` constructor.  To make an alternate active, use the :func:`setcontext`
 function.
 
 In accordance with the standard, the :mod:`decimal` module provides two ready to

Doc/library/os.rst

@@ -558,7 +558,7 @@ process and user.
 
 .. function:: initgroups(username, gid, /)
 
-   Call the system initgroups() to initialize the group access list with all of
+   Call the system ``initgroups()`` to initialize the group access list with all of
    the groups of which the specified username is a member, plus the specified
    group id.
 

Include/internal/pycore_magic_number.h

@@ -286,6 +286,7 @@ Known values:
     Python 3.15a1 3653 (Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST)
     Python 3.15a1 3654 (Fix missing exception handlers in logical expression)
     Python 3.15a1 3655 (Fix miscompilation of some module-level annotations)
+    Python 3.15a1 3656 (Add TRACE_RECORD instruction, for platforms with switch based interpreter)
 
 
     Python 3.16 will start with 3700
@@ -299,7 +300,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3655
+#define PYC_MAGIC_NUMBER 3656
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

Include/internal/pycore_opcode_metadata.h

@@ -364,7 +364,7 @@ extern void _Py_ClearExecutorDeletionList(PyInterpreterState *interp);
 
 int _PyJit_translate_single_bytecode_to_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int stop_tracing_opcode);
 
-int
+PyAPI_FUNC(int)
 _PyJit_TryInitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame,
     _Py_CODEUNIT *curr_instr, _Py_CODEUNIT *start_instr,
     _Py_CODEUNIT *close_loop_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit,