Apr 10, 2025 · Apr 11, 2025 · Apr 15, 2025 · Apr 15, 2025 · Apr 16, 2025 · Apr 16, 2025
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
 extern int _PyRunRemoteDebugger(PyThreadState *tstate);
 #endif

 _PyStackRef _PyForIter_NextWithIndex(PyObject *seq, _PyStackRef index);

 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
                                     _Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_UnpackSequence(_PyStackRef seq, _Py_CODEUNIT *instr,
                                          int oparg);
 extern void _Py_Specialize_ForIter(_PyStackRef iter, _Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_ForIter(_PyStackRef iter,_PyStackRef null_or_index,_Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_Send(_PyStackRef receiver, _Py_CODEUNIT *instr);
 extern void _Py_Specialize_ToBool(_PyStackRef value, _Py_CODEUNIT *instr);
 extern void _Py_Specialize_ContainsOp(_PyStackRef value, _Py_CODEUNIT *instr);
diff --git a/Include/internal/pycore_compile.h b/Include/internal/pycore_compile.h
 enum _PyCompile_FBlockType {
     COMPILE_FBLOCK_WHILE_LOOP,
     COMPILE_FBLOCK_FOR_LOOP,
     COMPILE_FBLOCK_ASYNC_FOR_LOOP,
     COMPILE_FBLOCK_TRY_EXCEPT,
     COMPILE_FBLOCK_FINALLY_TRY,
     COMPILE_FBLOCK_FINALLY_END,
diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h
    Python 3.14b1 3624 (Don't optimize LOAD_FAST when local is killed by DELETE_FAST)
    Python 3.15a0 3650 (Initial version)
    Python 3.15a1 3651 (Simplify LOAD_CONST)
    Python 3.15a1 3652 (Virtual iterators)


    Python 3.16 will start with 3700


 */

 #define PYC_MAGIC_NUMBER3651
 #define PYC_MAGIC_NUMBER3652
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
   (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_stackref.h b/Include/internal/pycore_stackref.h

 extern _PyStackRef PyStackRef_TagInt(intptr_t i);

 /* Increments a tagged int, but does not check for overflow */
 extern _PyStackRef PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref);

 extern bool
 PyStackRef_IsNullOrInt(_PyStackRef ref);

 }


 static inline _PyStackRef
 PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref)
 {
    assert(ref.bits != (uintptr_t)-1); // Deosn't overflow
    return (_PyStackRef){ .bits = ref.bits + 4 };
 }


 #ifdef Py_GIL_DISABLED

 #define Py_TAG_DEFERRED Py_TAG_REFCNT

 #endif // !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)

 #define PyStackRef_TYPE(stackref) Py_TYPE(PyStackRef_AsPyObjectBorrow(stackref))
 static inline PyTypeObject *
 PyStackRef_TYPE(_PyStackRef stackref) {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return &PyLong_Type;
    }
    return Py_TYPE(PyStackRef_AsPyObjectBorrow(stackref));
 }

 // Converts a PyStackRef back to a PyObject *, converting the
 // stackref to a new reference.
 static inline bool
 PyStackRef_GenCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return false;
    }
    return PyGen_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

 static inline bool
 PyStackRef_BoolCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return false;
    }
    return PyBool_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

 static inline bool
 PyStackRef_LongCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return true;
    }
    return PyLong_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

 static inline bool
 PyStackRef_ExceptionInstanceCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return false;
    }
    return PyExceptionInstance_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

 static inline bool
 PyStackRef_CodeCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return false;
    }
    return PyCode_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

 static inline bool
 PyStackRef_FunctionCheck(_PyStackRef stackref)
 {
    if (PyStackRef_IsTaggedInt(stackref)) {
        return false;
    }
    return PyFunction_Check(PyStackRef_AsPyObjectBorrow(stackref));
 }

diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -353,6 +353,8 @@ PyAPI_FUNC(_PyStackRef) _PyFloat_FromDouble_ConsumeInputs(_PyStackRef left, _PyS
		extern int _PyRunRemoteDebugger(PyThreadState *tstate);
		#endif

		_PyStackRef _PyForIter_NextWithIndex(PyObject *seq, _PyStackRef index);

		#ifdef __cplusplus
		}
		#endif
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -313,7 +313,7 @@ extern void _Py_Specialize_CompareOp(_PyStackRef lhs, _PyStackRef rhs,
		_Py_CODEUNIT *instr, int oparg);
		extern void _Py_Specialize_UnpackSequence(_PyStackRef seq, _Py_CODEUNIT *instr,
		int oparg);
		extern void _Py_Specialize_ForIter(_PyStackRef iter, _Py_CODEUNIT *instr, int oparg);
		extern void _Py_Specialize_ForIter(_PyStackRef iter,_PyStackRef null_or_index,_Py_CODEUNIT *instr, int oparg);
		extern void _Py_Specialize_Send(_PyStackRef receiver, _Py_CODEUNIT *instr);
		extern void _Py_Specialize_ToBool(_PyStackRef value, _Py_CODEUNIT *instr);
		extern void _Py_Specialize_ContainsOp(_PyStackRef value, _Py_CODEUNIT *instr);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,6 +95,7 @@ typedef enum {
		enum _PyCompile_FBlockType {
		COMPILE_FBLOCK_WHILE_LOOP,
		COMPILE_FBLOCK_FOR_LOOP,
		COMPILE_FBLOCK_ASYNC_FOR_LOOP,
		COMPILE_FBLOCK_TRY_EXCEPT,
		COMPILE_FBLOCK_FINALLY_TRY,
		COMPILE_FBLOCK_FINALLY_END,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -279,6 +279,8 @@ Known values:
		Python 3.14b1 3624 (Don't optimize LOAD_FAST when local is killed by DELETE_FAST)
		Python 3.15a0 3650 (Initial version)
		Python 3.15a1 3651 (Simplify LOAD_CONST)
		Python 3.15a1 3652 (Virtual iterators)


		Python 3.16 will start with 3700

Expand All		@@ -291,7 +293,7 @@ PC/launcher.c must also be updated.

		*/

		#define PYC_MAGIC_NUMBER3651
		#define PYC_MAGIC_NUMBER3652
		/* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
		(little-endian) and then appending b'\r\n'. */
		#define PYC_MAGIC_NUMBER_TOKEN \
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -232,6 +232,9 @@ extern intptr_t PyStackRef_UntagInt(_PyStackRef ref);

		extern _PyStackRef PyStackRef_TagInt(intptr_t i);

		/* Increments a tagged int, but does not check for overflow */
		extern _PyStackRef PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref);

markshannon marked this conversation as resolved. Show resolvedHide resolved
		extern bool
		PyStackRef_IsNullOrInt(_PyStackRef ref);

Expand DownExpand Up		@@ -262,6 +265,14 @@ PyStackRef_UntagInt(_PyStackRef i)
		}


		static inline _PyStackRef
		PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref)
		{
		assert(ref.bits != (uintptr_t)-1); // Deosn't overflow
		return (_PyStackRef){ .bits = ref.bits + 4 };
		}


		#ifdef Py_GIL_DISABLED

		#define Py_TAG_DEFERRED Py_TAG_REFCNT
Expand DownExpand Up		@@ -678,7 +689,13 @@ PyStackRef_XCLOSE(_PyStackRef ref)

		#endif // !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)

		#define PyStackRef_TYPE(stackref) Py_TYPE(PyStackRef_AsPyObjectBorrow(stackref))
		static inline PyTypeObject *
		PyStackRef_TYPE(_PyStackRef stackref) {
		if (PyStackRef_IsTaggedInt(stackref)) {
		return &PyLong_Type;
		}
		return Py_TYPE(PyStackRef_AsPyObjectBorrow(stackref));
		}

		// Converts a PyStackRef back to a PyObject *, converting the
		// stackref to a new reference.
Expand All		@@ -689,36 +706,54 @@ PyStackRef_XCLOSE(_PyStackRef ref)
		static inline bool
		PyStackRef_GenCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyGen_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_BoolCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyBool_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_LongCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return true;
		}
		return PyLong_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_ExceptionInstanceCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyExceptionInstance_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_CodeCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyCode_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_FunctionCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyFunction_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

Expand Down