Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-31 04:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-89653: PEP 670: Convert PyCell macros to functions (#92653)

Browse source 
Convert the following macros to static inline functions:

* PyCell_GET()
* PyCell_SET()

Limited C API version 3.12 no longer casts arguments.

Fix also usage of PyCell_SET(): only delete the old value after
setting the new value.
This commit is contained in:
Victor Stinner 2022-05-11 23:24:48 +02:00 • committed by GitHub
parent da5727a120
commit 897f14d38d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Include/cpython/cellobject.h
View file

@ -21,8 +21,23 @@ PyAPI_FUNC(PyObject *) PyCell_New(PyObject *);
PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *);
PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *);
#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref)
#define PyCell_SET(op, v) _Py_RVALUE(((PyCellObject *)(op))->ob_ref = (v))
static inline PyObject* PyCell_GET(PyObject *op) {
assert(PyCell_Check(op));
PyCellObject *cell = _Py_CAST(PyCellObject*, op);
return cell->ob_ref;
}
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030c0000
# define PyCell_GET(op) PyCell_GET(_PyObject_CAST(op))
#endif
static inline void PyCell_SET(PyObject *op, PyObject *value) {
assert(PyCell_Check(op));
PyCellObject *cell = _Py_CAST(PyCellObject*, op);
cell->ob_ref = value;
}
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030c0000
# define PyCell_SET(op, value) PyCell_SET(_PyObject_CAST(op), (value))
#endif
#ifdef __cplusplus
}

15
Objects/cellobject.c
View file

@ -56,22 +56,21 @@ PyCell_Get(PyObject *op)
PyErr_BadInternalCall();
return NULL;
}
Py_XINCREF(((PyCellObject*)op)->ob_ref);
return PyCell_GET(op);
PyObject *value = PyCell_GET(op);
return Py_XNewRef(value);
}
int
PyCell_Set(PyObject *op, PyObject *obj)
PyCell_Set(PyObject *op, PyObject *value)
{
PyObject* oldobj;
if (!PyCell_Check(op)) {
PyErr_BadInternalCall();
return -1;
}
oldobj = PyCell_GET(op);
Py_XINCREF(obj);
PyCell_SET(op, obj);
Py_XDECREF(oldobj);
PyObject *old_value = PyCell_GET(op);
Py_XINCREF(value);
PyCell_SET(op, value);
Py_XDECREF(old_value);
return 0;
}

2
Objects/frameobject.c
View file

@ -1086,9 +1086,9 @@ _PyFrame_LocalsToFast(_PyInterpreterFrame *frame, int clear)
if (cell != NULL) {
oldvalue = PyCell_GET(cell);
if (value != oldvalue) {
Py_XDECREF(oldvalue);
Py_XINCREF(value);
PyCell_SET(cell, value);
Py_XDECREF(oldvalue);
}
}
else if (value != oldvalue) {