Skip to content
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

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

Merged
merged 10 commits into from
Dec 20, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion Include/internal/pycore_typeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ _PyType_IsReady(PyTypeObject *type)

extern PyObject* _Py_type_getattro_impl(PyTypeObject *type, PyObject *name,
int *suppress_missing_attribute);
extern PyObject* _Py_type_getattro(PyTypeObject *type, PyObject *name);
extern PyObject* _Py_type_getattro(PyObject *type, PyObject *name);

extern PyObject* _Py_slot_tp_getattro(PyObject *self, PyObject *name);
extern PyObject* _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name);
Expand Down
2 changes: 1 addition & 1 deletion Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ PyObject_GetOptionalAttr(PyObject *v, PyObject *name, PyObject **result)
}
return 0;
}
if (tp->tp_getattro == (getattrofunc)_Py_type_getattro) {
if (tp->tp_getattro == _Py_type_getattro) {
int supress_missing_attribute_exception = 0;
*result = _Py_type_getattro_impl((PyTypeObject*)v, name, &supress_missing_attribute_exception);
if (supress_missing_attribute_exception) {
Expand Down
53 changes: 34 additions & 19 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,8 +1597,9 @@ static PyGetSetDef type_getsets[] = {
};

static PyObject *
type_repr(PyTypeObject *type)
type_repr(PyObject *self)
{
PyTypeObject *type = (PyTypeObject *)self;
if (type->tp_name == NULL) {
// type_repr() called before the type is fully initialized
// by PyType_Ready().
Expand Down Expand Up @@ -1630,8 +1631,9 @@ type_repr(PyTypeObject *type)
}

static PyObject *
type_call(PyTypeObject *type, PyObject *args, PyObject *kwds)
type_call(PyObject *self, PyObject *args, PyObject *kwds)
{
PyTypeObject *type = (PyTypeObject *)self;
PyObject *obj;
PyThreadState *tstate = _PyThreadState_GET();

Expand Down Expand Up @@ -4917,14 +4919,15 @@ _Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int * suppress_missin
/* This is similar to PyObject_GenericGetAttr(),
but uses _PyType_Lookup() instead of just looking in type->tp_dict. */
PyObject *
_Py_type_getattro(PyTypeObject *type, PyObject *name)
_Py_type_getattro(PyObject *type, PyObject *name)
{
return _Py_type_getattro_impl(type, name, NULL);
return _Py_type_getattro_impl((PyTypeObject *)type, name, NULL);
}

static int
type_setattro(PyTypeObject *type, PyObject *name, PyObject *value)
type_setattro(PyObject *self, PyObject *name, PyObject *value)
{
PyTypeObject *type = (PyTypeObject *)self;
int res;
if (type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE) {
PyErr_Format(
Expand Down Expand Up @@ -5069,8 +5072,10 @@ _PyStaticType_Dealloc(PyInterpreterState *interp, PyTypeObject *type)


static void
type_dealloc(PyTypeObject *type)
type_dealloc(PyObject *self)
{
PyTypeObject *type = (PyTypeObject *)self;

// Assert this is a heap-allocated type object
_PyObject_ASSERT((PyObject *)type, type->tp_flags & Py_TPFLAGS_HEAPTYPE);

Expand Down Expand Up @@ -5257,8 +5262,10 @@ PyDoc_STRVAR(type_doc,
"type(name, bases, dict, **kwds) -> a new type");

static int
type_traverse(PyTypeObject *type, visitproc visit, void *arg)
type_traverse(PyObject *self, visitproc visit, void *arg)
{
PyTypeObject *type = (PyTypeObject *)self;

/* Because of type_is_gc(), the collector only calls this
for heaptypes. */
if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
Expand Down Expand Up @@ -5286,8 +5293,10 @@ type_traverse(PyTypeObject *type, 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 @@ -5334,9 +5343,9 @@ type_clear(PyTypeObject *type)
}

static int
type_is_gc(PyTypeObject *type)
type_is_gc(PyObject *type)
{
return type->tp_flags & Py_TPFLAGS_HEAPTYPE;
return ((PyTypeObject *)type)->tp_flags & Py_TPFLAGS_HEAPTYPE;
}


Expand All @@ -5349,28 +5358,28 @@ PyTypeObject PyType_Type = {
"type", /* tp_name */
sizeof(PyHeapTypeObject), /* tp_basicsize */
sizeof(PyMemberDef), /* tp_itemsize */
(destructor)type_dealloc, /* tp_dealloc */
type_dealloc, /* tp_dealloc */
offsetof(PyTypeObject, tp_vectorcall), /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
(reprfunc)type_repr, /* tp_repr */
type_repr, /* tp_repr */
&type_as_number, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
(ternaryfunc)type_call, /* tp_call */
type_call, /* tp_call */
0, /* tp_str */
(getattrofunc)_Py_type_getattro, /* tp_getattro */
(setattrofunc)type_setattro, /* tp_setattro */
_Py_type_getattro, /* tp_getattro */
type_setattro, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_BASETYPE | Py_TPFLAGS_TYPE_SUBCLASS |
Py_TPFLAGS_HAVE_VECTORCALL |
Py_TPFLAGS_ITEMS_AT_END, /* tp_flags */
type_doc, /* tp_doc */
(traverseproc)type_traverse, /* tp_traverse */
(inquiry)type_clear, /* tp_clear */
type_traverse, /* tp_traverse */
type_clear, /* tp_clear */
0, /* tp_richcompare */
offsetof(PyTypeObject, tp_weaklist), /* tp_weaklistoffset */
0, /* tp_iter */
Expand All @@ -5387,7 +5396,7 @@ PyTypeObject PyType_Type = {
0, /* tp_alloc */
type_new, /* tp_new */
PyObject_GC_Del, /* tp_free */
(inquiry)type_is_gc, /* tp_is_gc */
type_is_gc, /* tp_is_gc */
.tp_vectorcall = type_vectorcall,
};

Expand Down Expand Up @@ -6555,6 +6564,12 @@ PyDoc_STRVAR(object_doc,
"When called, it accepts no arguments and returns a new featureless\n"
"instance that has no instance attributes and cannot be given any.\n");

static Py_hash_t
object_hash(PyObject *obj)
{
return _Py_HashPointer(obj);
}

PyTypeObject PyBaseObject_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"object", /* tp_name */
Expand All @@ -6569,7 +6584,7 @@ PyTypeObject PyBaseObject_Type = {
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
(hashfunc)_Py_HashPointer, /* tp_hash */
object_hash, /* tp_hash */
0, /* tp_call */
object_str, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
Expand Down
Loading