bpo-39573: Convert Py_TYPE() to a static inline function

Doc/c-api/structures.rst

@@ -62,12 +62,13 @@ the definition of all other Python objects.
  See documentation of :c:type:`PyVarObject` above.
 
 
-.. c:macro:: Py_TYPE(o)
+.. c:function:: PyTypeObject* Py_TYPE(PyObject *o)
 
- This macro is used to access the :attr:`ob_type` member of a Python object.
- It expands to::
+ This function is used to access the :attr:`ob_type` member of a Python object.
 
- (((PyObject*)(o))->ob_type)
+ .. versionchanged:: 3.10
+ :c:func:`Py_TYPE()` is changed to the inline static function.
+ Use :c:func:`Py_SET_TYPE()` to set an object type.
 
 
 .. c:function:: int Py_IS_TYPE(PyObject *o, PyTypeObject *type)

Doc/whatsnew/3.10.rst

@@ -91,8 +91,8 @@ Optimizations
 =============
 
 
-Build and C API Changes
-=======================
+Build Changes
+=============
 
 
 
@@ -105,11 +105,12 @@ Removed
 =======
 
 
+C API Changes
+=============
 
 Porting to Python 3.10
-======================
-
-This section lists previously described changes and other bugfixes
-that may require changes to your code.
-
+----------------------
 
+* Since :c:func:`Py_TYPE()` is changed to the inline static function,
+ ``Py_TYPE(obj) = new_type`` should be ported to use :c:func:`Py_SET_TYPE()`.
+ (Contributed by Dong-hee Na in :issue:`39573`.)

Include/object.h

@@ -121,9 +121,13 @@ typedef struct {
 #define _PyVarObject_CAST(op) ((PyVarObject*)(op))
 
 #define Py_REFCNT(ob) (_PyObject_CAST(ob)->ob_refcnt)
-#define Py_TYPE(ob) (_PyObject_CAST(ob)->ob_type)
 #define Py_SIZE(ob) (_PyVarObject_CAST(ob)->ob_size)
 
+static inline PyTypeObject* _Py_TYPE(const PyObject *ob) {
+ return ob->ob_type;
+}
+#define Py_TYPE(ob) _Py_TYPE(_PyObject_CAST_CONST(ob))
+
 static inline int _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) {
  return ob->ob_type == type;
 }

Misc/NEWS.d/next/Core and Builtins/2020-05-22-00-34-34.bpo-39573.QO2QHj.rst

@@ -0,0 +1,2 @@
+:c:func:`Py_TYPE()` is changed to the inline static function. Patch by
+Dong-hee Na.