Skip to content

gh-111178: Make slot functions in typeobject.c have compatible types #112752

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
encukou merged 10 commits into from
Dec 20, 2023
Merged

gh-111178: Make slot functions in typeobject.c have compatible types #112752

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
66ba41b
Do not cast _Py_HashPointer to hashfunc
chrstphrchvz Dec 5, 2023
f98aee3
Make type_repr() compatible with reprfunc
chrstphrchvz Dec 5, 2023
c48671f
Make type_dealloc() compatible with destructor
chrstphrchvz Dec 5, 2023
e32433c
Make type_call() compatible with ternaryfunc
chrstphrchvz Dec 5, 2023
d4da68e
Make type_traverse() compatible with traverseproc
chrstphrchvz Dec 5, 2023
a8b30d9
Make type_clear() compatible with inquiry
chrstphrchvz Dec 5, 2023
c3f7da2
Make type_is_gc() compatible with inquiry
chrstphrchvz Dec 5, 2023
f68ce96
Make type_setattro() compatible with setattrofunc
chrstphrchvz Dec 5, 2023
f3eb756
Make _Py_type_getattro() compatible with getattrofunc
chrstphrchvz Dec 5, 2023
8d78e04
Merge branch 'main' into patch-111178-typeobject
chrstphrchvz Dec 6, 2023
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
Prev Previous commit
Next Next commit
Make type_clear() compatible with inquiry
  • Loading branch information
@chrstphrchvz
chrstphrchvz authored Dec 5, 2023
commit a8b30d91fba3dc086c20fdc563483cc53d3ce09c
6 changes: 4 additions & 2 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5292,8 +5292,10 @@ type_traverse(PyObject *self, visitproc visit, void *arg)
}

static int
type_clear(PyTypeObject *type)
type_clear(PyObject *self)
{
PyTypeObject *type = (PyTypeObject *)self;

/* Because of type_is_gc(), the collector only calls this
for heaptypes. */
_PyObject_ASSERT((PyObject *)type, type->tp_flags & Py_TPFLAGS_HEAPTYPE);
Expand Down Expand Up @@ -5376,7 +5378,7 @@ PyTypeObject PyType_Type = {
Py_TPFLAGS_ITEMS_AT_END, /* tp_flags */
type_doc, /* tp_doc */
type_traverse, /* tp_traverse */
(inquiry)type_clear, /* tp_clear */
type_clear, /* tp_clear */
0, /* tp_richcompare */
offsetof(PyTypeObject, tp_weaklist), /* tp_weaklistoffset */
0, /* tp_iter */
Expand Down