8000 gh-107073: Make PyObject_VisitManagedDict() public · python/cpython@6d22132 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 6d22132

Browse files
vstinnervstinner
committed
gh-107073: Make PyObject_VisitManagedDict() public
Make PyObject_VisitManagedDict() and PyObject_ClearManagedDict() functions public in Python 3.12 C API. * Rename _PyObject_VisitManagedDict() to PyObject_VisitManagedDict(). * Rename _PyObject_ClearManagedDict() to PyObject_ClearManagedDict(). * Document these functions.
1 parent 23f54c1 commit 6d22132

File tree

11 files changed

+78
-25
lines changed

11 files changed

+78
-25
lines changed

‎Doc/c-api/object.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,3 +476,21 @@ Object Protocol
476476
:c:macro:`Py_TPFLAGS_ITEMS_AT_END` set.
477477
478478
.. versionadded:: 3.12
479+
480+
.. c:function:: int PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
481+
482+
Visit the managed dictionary of *obj*.
483+
484+
This function must only be called in a traverse function of the type which
485+
has the :c:macro:`Py_TPFLAGS_MANAGED_DICT` flag set.
486+
487+
.. versionadded:: 3.12
488+
489+
.. c:function:: void PyObject_ClearManagedDict(PyObject *obj)
490+
491+
Clear the managed dictionary of *obj*.
492+
493+
This function must only be called in a traverse function of the type which
494+
has the :c:macro:`Py_TPFLAGS_MANAGED_DICT` flag set.
495+
496+
.. versionadded:: 3.12

‎Doc/c-api/typeobj.rst

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,9 @@ and :c:data:`PyType_Type` effectively act as defaults.)
11311131

11321132
If this flag is set, :c:macro:`Py_TPFLAGS_HAVE_GC` should also be set.
11331133

1134+
The type traverse function must call :c:func:`PyObject_VisitManagedDict`
1135+
and its clear function must call :c:func:`PyObject_ClearManagedDict`.
1136+
11341137
.. versionadded:: 3.12
11351138

11361139
**Inheritance:**
@@ -1368,6 +1371,23 @@ and :c:data:`PyType_Type` effectively act as defaults.)
13681371
debugging aid you may want to visit it anyway just so the :mod:`gc` module's
13691372
:func:`~gc.get_referents` function will include it.
13701373

1374+
Heap types (:c:macro:`Py_TPFLAGS_HEAPTYPE`) must visit their type with::
1375+
1376+
Py_VISIT(Py_TYPE(self));
1377+
1378+
It is only needed since Python 3.9. To support Python 3.8 and older, this
1379+
line must be conditionnal::
1380+
1381+
#if PY_VERSION_HEX >= 0x03090000
1382+
Py_VISIT(Py_TYPE(self));
1383+
#endif
1384+
1385+
If the :c:macro:`Py_TPFLAGS_MANAGED_DICT` bit is set in the
1386+
:c:member:`~PyTypeObject.tp_flags` field, the traverse function must call
1387+
:c:func:`PyObject_VisitManagedDict` like this::
1388+
1389+
PyObject_VisitManagedDict((PyObject*)self, visit, arg);
1390+
13711391
.. warning::
13721392
When implementing :c:member:`~PyTypeObject.tp_traverse`, only the
13731393
members that the instance *owns* (by having :term:`strong references
@@ -1451,6 +1471,12 @@ and :c:data:`PyType_Type` effectively act as defaults.)
14511471
so that *self* knows the contained object can no longer be used. The
14521472
:c:func:`Py_CLEAR` macro performs the operations in a safe order.
14531473

1474+
If the :c:macro:`Py_TPFLAGS_MANAGED_DICT` bit is set in the
1475+
:c:member:`~PyTypeObject.tp_flags` field, the traverse function must call
1476+
:func:`PyObject_ClearManagedDict` like this::
1477+
1478+
PyObject_ClearManagedDict((PyObject*)self);
1479+
14541480
Note that :c:member:`~PyTypeObject.tp_clear` is not *always* called
14551481
before an instance is deallocated. For example, when reference counting
14561482
is enough to determine that an object is no longer used, the cyclic garbage
@@ -1801,7 +1827,7 @@ and :c:data:`PyType_Type` effectively act as defaults.)
18011827
field is ``NULL`` then no :attr:`~object.__dict__` gets created for instances.
18021828

18031829
If the :c:macro:`Py_TPFLAGS_MANAGED_DICT` bit is set in the
1804-
:c:member:`~PyTypeObject.tp_dict` field, then
1830+
:c:member:`~PyTypeObject.tp_flags` field, then
18051831
:c:member:`~PyTypeObject.tp_dictoffset` will be set to ``-1``, to indicate
18061832
that it is unsafe to use this field.
18071833

‎Doc/whatsnew/3.12.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,11 @@ New Features
18061806
hide implementation details.
18071807
(Contributed by Victor Stinner in :gh:`105387`.)
18081808

1809+
* Add :c:func:`PyObject_VisitManagedDict` and :func:`PyObject_ClearManagedDict`
1810+
functions which must be called by the traverse and clear functions of a type
1811+
using :c:macro:`Py_TPFLAGS_MANAGED_DICT` flag.
1812+
(Contributed by Victor Stinner in :gh:`107073`.)
1813+
18091814
Porting to Python 3.12
18101815
----------------------
18111816

@@ -1855,8 +1860,8 @@ Porting to Python 3.12
18551860
The use of ``tp_dictoffset`` and ``tp_weaklistoffset`` is still
18561861
supported, but does not fully support multiple inheritance
18571862
(:gh:`95589`), and performance may be worse.
1858-
Classes declaring :c:macro:`Py_TPFLAGS_MANAGED_DICT` should call
1859-
:c:func:`!_PyObject_VisitManagedDict` and :c:func:`!_PyObject_ClearManagedDict`
1863+
Classes declaring :c:macro:`Py_TPFLAGS_MANAGED_DICT` must call
1864+
:c:func:`PyObject_VisitManagedDict` and :c:func:`PyObject_ClearManagedDict`
18601865
to traverse and clear their instance's dictionaries.
18611866
To clear weakrefs, call :c:func:`PyObject_ClearWeakRefs`, as before.
18621867

‎Include/cpython/object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ PyAPI_FUNC(int) _PyTrash_cond(PyObject *op, destructor dealloc);
444444

445445
PyAPI_FUNC(void *) PyObject_GetItemData(PyObject *obj);
446446

447-
PyAPI_FUNC(int) _PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg);
448-
PyAPI_FUNC(void) _PyObject_ClearManagedDict(PyObject *obj);
447+
PyAPI_FUNC(int) PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg);
448+
PyAPI_FUNC(void) PyObject_ClearManagedDict(PyObject *obj);
449449

450450
#define TYPE_MAX_WATCHERS 8
451451

‎Misc/NEWS.d/next/C API/2023-09-01-15-35-05.gh-issue-107073.zCz0iN.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Add :c:func:`PyObject_VisitManagedDict` and
2+
:func:`PyObject_ClearManagedDict` functions which must be called by the
3+
traverse and clear functions of a type using
4+
:c:macro:`Py_TPFLAGS_MANAGED_DICT` flag. Patch by Victor Stinner.

‎Modules/_asynciomodule.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ FutureObj_clear(FutureObj *fut)
816816
Py_CLEAR(fut->fut_source_tb);
817817
Py_CLEAR(fut->fut_cancel_msg);
818818
Py_CLEAR(fut->fut_cancelled_exc);
819-
_PyObject_ClearManagedDict((PyObject *)fut);
819+
PyObject_ClearManagedDict((PyObject *)fut);
820820
return 0;
821821
}
822822

@@ -834,7 +834,7 @@ FutureObj_traverse(FutureObj *fut, visitproc visit, void *arg)
834834
Py_VISIT(fut->fut_source_tb);
835835
Py_VISIT(fut->fut_cancel_msg);
836836
Py_VISIT(fut->fut_cancelled_exc);
837-
_PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
837+
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
838838
return 0;
839839
}
840840

@@ -2181,7 +2181,7 @@ TaskObj_traverse(TaskObj *task, visitproc visit, void *arg)
21812181
Py_VISIT(fut->fut_source_tb);
21822182
Py_VISIT(fut->fut_cancel_msg);
21832183
Py_VISIT(fut->fut_cancelled_exc);
2184-
_PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
2184+
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
21852185
return 0;
21862186
}
21872187

‎Modules/_testcapi/heaptype.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -805,21 +805,21 @@ static int
805805
heapmanaged_traverse(HeapCTypeObject *self, visitproc visit, void *arg)
806806
{
807807
Py_VISIT(Py_TYPE(self));
808-
return _PyObject_VisitManagedDict((PyObject *)self, visit, arg);
808+
return PyObject_VisitManagedDict((PyObject *)self, visit, arg);
809809
}
810810

811811
static int
812812
heapmanaged_clear(HeapCTypeObject *self)
813813
{
814-
_PyObject_ClearManagedDict((PyObject *)self);
814+
PyObject_ClearManagedDict((PyObject *)self);
815815
return 0;
816816
}
817817

818818
static void
819819
heapmanaged_dealloc(HeapCTypeObject *self)
820820
{
821821
PyTypeObject *tp = Py_TYPE(self);
822-
_PyObject_ClearManagedDict((PyObject *)self);
822+
PyObject_ClearManagedDict((PyObject *)self);
823823
PyObject_GC_UnTrack(self);
824824
PyObject_GC_Del(self);
825825
Py_DECREF(tp);

‎Modules/_testcapimodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2927,7 +2927,7 @@ settrace_to_error(PyObject *self, PyObject *list)
29272927
static PyObject *
29282928
clear_managed_dict(PyObject *self, PyObject *obj)
29292929
{
2930-
_PyObject_ClearManagedDict(obj);
2930+
PyObject_ClearManagedDict(obj);
29312931
Py_RETURN_NONE;
29322932
}
29332933

‎Objects/dictobject.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5650,7 +5650,7 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
56505650
}
56515651

56525652
int
5653-
_PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
5653+
PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
56545654
{
56555655
PyTypeObject *tp = Py_TYPE(obj);
56565656
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
@@ -5673,7 +5673,7 @@ _PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
56735673
}
56745674

56755675
void
5676-
_PyObject_ClearManagedDict(PyObject *obj)
5676+
PyObject_ClearManagedDict(PyObject *obj)
56775677
{
56785678
PyTypeObject *tp = Py_TYPE(obj);
56795679
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {

‎Objects/typeobject.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ subtype_traverse(PyObject *self, visitproc visit, void *arg)
18371837
assert(base->tp_dictoffset == 0);
18381838
if (type->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
18391839
assert(type->tp_dictoffset == -1);
1840-
int err = _PyObject_VisitManagedDict(self, visit, arg);
1840+
int err = PyObject_VisitManagedDict(self, visit, arg);
18411841
if (err) {
18421842
return err;
18431843
}
@@ -1907,7 +1907,7 @@ subtype_clear(PyObject *self)
19071907
__dict__ slots (as in the case 'self.__dict__ is self'). */
19081908
if (type->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
19091909
if ((base->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
1910-
_PyObject_ClearManagedDict(self);
1910+
PyObject_ClearManagedDict(self);
19111911
}
19121912
}
19131913
else if (type->tp_dictoffset != base->tp_dictoffset) {

‎Objects/typevarobject.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ typevar_dealloc(PyObject *self)
200200
Py_XDECREF(tv->evaluate_bound);
201201
Py_XDECREF(tv->constraints);
202202
Py_XDECREF(tv->evaluate_constraints);
203-
_PyObject_ClearManagedDict(self);
203+
PyObject_ClearManagedDict(self);
204204
PyObject_ClearWeakRefs(self);
205205

206206
Py_TYPE(self)->tp_free(self);
@@ -216,7 +216,7 @@ typevar_traverse(PyObject *self, visitproc visit, void *arg)
216216
Py_VISIT(tv->evaluate_bound);
217217
Py_VISIT(tv->constraints);
218218
Py_VISIT(tv->evaluate_constraints);
219-
_PyObject_VisitManagedDict(self, visit, arg);
219+
PyObject_VisitManagedDict(self, visit, arg);
220220
return 0;
221221
}
222222

@@ -227,7 +227,7 @@ typevar_clear(typevarobject *self)
227227
Py_CLEAR(self->evaluate_bound);
228228
Py_CLEAR(self->constraints);
229229
Py_CLEAR(self->evaluate_constraints);
230-
_PyObject_ClearManagedDict((PyObject *)self);
230+
PyObject_ClearManagedDict((PyObject *)self);
231231
return 0;
232232
}
233233

@@ -744,7 +744,7 @@ paramspec_dealloc(PyObject *self)
744744

745745
Py_DECREF(ps->name);
746746
Py_XDECREF(ps->bound);
747-
_PyObject_ClearManagedDict(self);
747+
PyObject_ClearManagedDict(self);
748748
PyObject_ClearWeakRefs(self);
749749

750750
Py_TYPE(self)->tp_free(self);
@@ -757,15 +757,15 @@ paramspec_traverse(PyObject *self, visitproc visit, void *arg)
757757
Py_VISIT(Py_TYPE(self));
758758
paramspecobject *ps = (paramspecobject *)self;
759759
Py_VISIT(ps->bound);
760-
_PyObject_VisitManagedDict(self, visit, arg);
760+
PyObject_VisitManagedDict(self, visit, arg);
761761
return 0;
762762
}
763763

764764
static int
765765
paramspec_clear(paramspecobject *self)
766766
{
767767
Py_CLEAR(self->bound);
768-
_PyObject_ClearManagedDict((PyObject *)self);
768+
PyObject_ClearManagedDict((PyObject *)self);
769769
return 0;
770770
}
771771

@@ -1026,7 +1026,7 @@ typevartuple_dealloc(PyObject *self)
10261026
typevartupleobject *tvt = (typevartupleobject *)self;
10271027

10281028
Py_DECREF(tvt->name);
1029-
_PyObject_ClearManagedDict(self);
1029+
PyObject_ClearManagedDict(self);
10301030
PyObject_ClearWeakRefs(self);
10311031

10321032
Py_TYPE(self)->tp_free(self);
@@ -1165,14 +1165,14 @@ static int
11651165
typevartuple_traverse(PyObject *self, visitproc visit, void *arg)
11661166
{
11671167
Py_VISIT(Py_TYPE(self));
1168-
_PyObject_VisitManagedDict(self, visit, arg);
1168+
PyObject_VisitManagedDict(self, visit, arg);
11691169
return 0;
11701170
}
11711171

11721172
static int
11731173
typevartuple_clear(PyObject *self)
11741174
{
1175-
_PyObject_ClearManagedDict(self);
1175+
PyObject_ClearManagedDict(self);
11761176
return 0;
11771177
}
11781178

0 commit comments

Comments
 (0)
0