Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 6 commits into from
May 25, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21dd58e
bpo-39573: Convert Py_TYPE() to a static inline function
corona10 May 21, 2020
8e9637a
bpo-39573: Update docs
corona10 May 22, 2020
a8b98db
bpo-39573: Apply code review
corona10 May 25, 2020
4306ac8
Update Doc/whatsnew/3.10.rst
corona10 May 25, 2020
cd3c677
Update Doc/c-api/structures.rst
corona10 May 25, 2020
7757af5
bpo-39573: Apply code review
corona10 May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Doc/c-api/structures.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,12 +62,15 @@ the definition of all other Python objects.
See documentation of :c:type:`PyVarObject` above.


.. c:macro:: Py_TYPE(o)
.. c:function:: PyTypeObject* Py_TYPE(const PyObject *o)

This macro is used to access the :attr:`ob_type` member of a Python object.
It expands to::
Get the type of the Python object *o*.

Return a borrowed reference.

(((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)
Expand Down
30 changes: 23 additions & 7 deletions Doc/whatsnew/3.10.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,25 +91,41 @@ Optimizations
=============


Build and C API Changes
=======================



Deprecated
==========



Removed
=======



Porting to Python 3.10
======================

This section lists previously described changes and other bugfixes
that may require changes to your code.



Build Changes
=============


C API Changes
=============

New Features
------------


Porting to Python 3.10
----------------------

* Since :c:func:`Py_TYPE()` is changed to the inline static function,
``Py_TYPE(obj) = new_type`` must be replaced with ``Py_SET_TYPE(obj, new_type)``:
see :c:func:`Py_SET_TYPE()` (available since Python 3.9).
(Contributed by Dong-hee Na in :issue:`39573`.)


Removed
-------
6 changes: 5 additions & 1 deletion Include/object.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-05-22-00-34-34.bpo-39573.QO2QHj.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
:c:func:`Py_TYPE()` is changed to the inline static function. Patch by
Dong-hee Na.