mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 12:48:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-111178: Fix function signatures in weakrefobject.c (#124903)

Browse source
This commit is contained in:
Victor Stinner 2024-10-02 17:01:23 +02:00 • committed by GitHub
parent 8d7d257f6b
commit 1ea6672a6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Include/cpython/weakrefobject.h
View file

@ -42,13 +42,13 @@ struct _PyWeakReference {
PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self); PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self);
#define _PyWeakref_CAST(op) \
(assert(PyWeakref_Check(op)), _Py_CAST(PyWeakReference*, (op)))
Py_DEPRECATED(3.13) static inline PyObject* PyWeakref_GET_OBJECT(PyObject *ref_obj) Py_DEPRECATED(3.13) static inline PyObject* PyWeakref_GET_OBJECT(PyObject *ref_obj)
{ {
PyWeakReference *ref; PyWeakReference *ref = _PyWeakref_CAST(ref_obj);
PyObject *obj; PyObject *obj = ref->wr_object;
assert(PyWeakref_Check(ref_obj));
ref = _Py_CAST(PyWeakReference*, ref_obj);
obj = ref->wr_object;
// Explanation for the Py_REFCNT() check: when a weakref's target is part // Explanation for the Py_REFCNT() check: when a weakref's target is part
// of a long chain of deallocations which triggers the trashcan mechanism, // of a long chain of deallocations which triggers the trashcan mechanism,
// clearing the weakrefs can be delayed long after the target's refcount // clearing the weakrefs can be delayed long after the target's refcount

35
Objects/weakrefobject.c
View file

@ -104,9 +104,11 @@ clear_weakref_lock_held(PyWeakReference *self, PyObject **callback)
// Clear the weakref and its callback // Clear the weakref and its callback
static void static void
clear_weakref(PyWeakReference *self) clear_weakref(PyObject *op)
{ {
PyWeakReference *self = _PyWeakref_CAST(op);
PyObject *callback = NULL; PyObject *callback = NULL;
// self->wr_object may be Py_None if the GC cleared the weakref, so lock // self->wr_object may be Py_None if the GC cleared the weakref, so lock
// using the pointer in the weakref. // using the pointer in the weakref.
LOCK_WEAKREFS_FOR_WR(self); LOCK_WEAKREFS_FOR_WR(self);
@ -139,22 +141,24 @@ static void
weakref_dealloc(PyObject *self) weakref_dealloc(PyObject *self)
{ {
PyObject_GC_UnTrack(self); PyObject_GC_UnTrack(self);
clear_weakref((PyWeakReference *) self); clear_weakref(self);
Py_TYPE(self)->tp_free(self); Py_TYPE(self)->tp_free(self);
} }
static int static int
gc_traverse(PyWeakReference *self, visitproc visit, void *arg) gc_traverse(PyObject *op, visitproc visit, void *arg)
{ {
PyWeakReference *self = _PyWeakref_CAST(op);
Py_VISIT(self->wr_callback); Py_VISIT(self->wr_callback);
return 0; return 0;
} }
static int static int
gc_clear(PyWeakReference *self) gc_clear(PyObject *op)
{ {
PyWeakReference *self = _PyWeakref_CAST(op);
PyObject *callback; PyObject *callback;
// The world is stopped during GC in free-threaded builds. It's safe to // The world is stopped during GC in free-threaded builds. It's safe to
// call this without holding the lock. // call this without holding the lock.
@ -198,8 +202,9 @@ weakref_hash_lock_held(PyWeakReference *self)
} }
static Py_hash_t static Py_hash_t
weakref_hash(PyWeakReference *self) weakref_hash(PyObject *op)
{ {
PyWeakReference *self = _PyWeakref_CAST(op);
Py_hash_t hash; Py_hash_t hash;
Py_BEGIN_CRITICAL_SECTION(self); Py_BEGIN_CRITICAL_SECTION(self);
hash = weakref_hash_lock_held(self); hash = weakref_hash_lock_held(self);
@ -499,11 +504,11 @@ _PyWeakref_RefType = {
.tp_vectorcall_offset = offsetof(PyWeakReference, vectorcall), .tp_vectorcall_offset = offsetof(PyWeakReference, vectorcall),
.tp_call = PyVectorcall_Call, .tp_call = PyVectorcall_Call,
.tp_repr = weakref_repr, .tp_repr = weakref_repr,
.tp_hash = (hashfunc)weakref_hash, .tp_hash = weakref_hash,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_HAVE_VECTORCALL | Py_TPFLAGS_BASETYPE, Py_TPFLAGS_HAVE_VECTORCALL | Py_TPFLAGS_BASETYPE,
.tp_traverse = (traverseproc)gc_traverse, .tp_traverse = gc_traverse,
.tp_clear = (inquiry)gc_clear, .tp_clear = gc_clear,
.tp_richcompare = weakref_richcompare, .tp_richcompare = weakref_richcompare,
.tp_methods = weakref_methods, .tp_methods = weakref_methods,
.tp_members = weakref_members, .tp_members = weakref_members,
@ -687,7 +692,7 @@ proxy_bool(PyObject *proxy)
} }
static void static void
proxy_dealloc(PyWeakReference *self) proxy_dealloc(PyObject *self)
{ {
PyObject_GC_UnTrack(self); PyObject_GC_UnTrack(self);
clear_weakref(self); clear_weakref(self);
@ -850,7 +855,7 @@ _PyWeakref_ProxyType = {
sizeof(PyWeakReference), sizeof(PyWeakReference),
0, 0,
/* methods */ /* methods */
(destructor)proxy_dealloc, /* tp_dealloc */ proxy_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
@ -868,8 +873,8 @@ _PyWeakref_ProxyType = {
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)gc_traverse, /* tp_traverse */ gc_traverse, /* tp_traverse */
(inquiry)gc_clear, /* tp_clear */ gc_clear, /* tp_clear */
proxy_richcompare, /* tp_richcompare */ proxy_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
proxy_iter, /* tp_iter */ proxy_iter, /* tp_iter */
@ -885,7 +890,7 @@ _PyWeakref_CallableProxyType = {
sizeof(PyWeakReference), sizeof(PyWeakReference),
0, 0,
/* methods */ /* methods */
(destructor)proxy_dealloc, /* tp_dealloc */ proxy_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
@ -902,8 +907,8 @@ _PyWeakref_CallableProxyType = {
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)gc_traverse, /* tp_traverse */ gc_traverse, /* tp_traverse */
(inquiry)gc_clear, /* tp_clear */ gc_clear, /* tp_clear */
proxy_richcompare, /* tp_richcompare */ proxy_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
proxy_iter, /* tp_iter */ proxy_iter, /* tp_iter */