Skip to content

gh-89546: Clean up PyType_FromMetaclass #93686

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
miss-islington merged 19 commits into from
Jun 14, 2022
Merged

gh-89546: Clean up PyType_FromMetaclass #93686

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d43d5ca
Raise invalid slot exceptions early
encukou May 31, 2022
5145034
Switch to `switch` for the slots
encukou May 31, 2022
87b28aa
Allocate & copy the docstring early
encukou Jun 1, 2022
9fb6b11
Prepare the type names early
encukou Jun 1, 2022
7fd0c6d
Move offset setting to before PyType_Ready
encukou Jun 1, 2022
06fe302
Add comment on preparing special slots
encukou Jun 1, 2022
8bb54f8
Comment that we don't want to call Python code while a type is half-b…
encukou Jun 1, 2022
6c25cfc
Add comment on the function's refcounting strategy
encukou Jun 1, 2022
7edb478
Check that base & offsets fit in the basicsize
encukou Jun 1, 2022
2075958
Add blurb for the new check
encukou Jun 10, 2022
763ea2d
Move variable declarations out of `switch` cases
encukou Jun 10, 2022
5ca1502
Fix ReST syntax (*sigh*)
encukou Jun 10, 2022
5b18552
Downcast to int to avoid a warning
encukou Jun 13, 2022
34edc2a
Reflow check_basicsize_includes_size_and_offsets to conform to style …
encukou Jun 13, 2022
e45f77f
Reword error messages to say "offset is out of bounds"
encukou Jun 13, 2022
9713fb4
Move modname down to improve scoping
encukou Jun 13, 2022
a997413
Move variables to smaller scopes
encukou Jun 13, 2022
b197bb5
Merge main branch to resolve conflicts
encukou Jun 13, 2022
f53d86c
One more PEP 7 nit!
encukou Jun 14, 2022
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
Switch to switch for the slots
  • Loading branch information
@encukou
encukou committed Jun 10, 2022
commit 5145034e7f920e52baf719649d0d2ec9f2aece4f
29 changes: 17 additions & 12 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3421,7 +3421,8 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
PyErr_SetString(PyExc_RuntimeError, "invalid slot offset");
goto finally;
}
if (slot->slot == Py_tp_members) {
switch (slot->slot) {
case Py_tp_members:
if (nmembers != 0) {
PyErr_SetString(
PyExc_SystemError,
Expand Down Expand Up @@ -3449,6 +3450,7 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
vectorcalloffset = memb->offset;
}
}
break;
}
}

Expand Down Expand Up @@ -3558,11 +3560,13 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
type->tp_itemsize = spec->itemsize;

for (slot = spec->slots; slot->slot; slot++) {
if (slot->slot == Py_tp_base || slot->slot == Py_tp_bases) {
size_t len;
switch (slot->slot) {
case Py_tp_base:
case Py_tp_bases:
/* Processed above */
continue;
}
else if (slot->slot == Py_tp_doc) {
break;
case Py_tp_doc:
/* For the docstring slot, which usually points to a static string
literal, we need to make a copy */
if (type->tp_doc != NULL) {
Expand All @@ -3573,9 +3577,9 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
}
if (slot->pfunc == NULL) {
type->tp_doc = NULL;
continue;
break;
}
size_t len = strlen(slot->pfunc)+1;
len = strlen(slot->pfunc)+1;
char *tp_doc = PyObject_Malloc(len);
if (tp_doc == NULL) {
type->tp_doc = NULL;
Expand All @@ -3584,14 +3588,14 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
}
memcpy(tp_doc, slot->pfunc, len);
type->tp_doc = tp_doc;
}
else if (slot->slot == Py_tp_members) {
break;
case Py_tp_members:
/* Move the slots to the heap type itself */
size_t len = Py_TYPE(type)->tp_itemsize * nmembers;
len = Py_TYPE(type)->tp_itemsize * nmembers;
memcpy(_PyHeapType_GET_MEMBERS(res), slot->pfunc, len);
type->tp_members = _PyHeapType_GET_MEMBERS(res);
}
else {
break;
default:
/* Copy other slots directly */
PySlot_Offset slotoffsets = pyslot_offsets[slot->slot];
slot_offset = slotoffsets.slot_offset;
Expand All @@ -3602,6 +3606,7 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
subslot_offset = slotoffsets.subslot_offset;
*(void**)((char*)parent_slot + subslot_offset) = slot->pfunc;
}
break;
}
}
if (type->tp_dealloc == NULL) {
Expand Down