Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-37012: Clean up special cases in PyType_FromSpecWithBases slot assignments (GH-13496) 

The main slot assignment loop is now if-else if ladder, making the
control flow clearer.

Based on suggestion by Victor Stinner in:
https://github.com/python/cpython/pull/10304/#issuecomment-491123026
This commit is contained in:
Petr Viktorin 2019-06-03 01:31:12 +02:00 committed by GitHub
parent 0d70227e41
commit 7f4ae1b2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Objects/typeobject.c
View File

@ -2941,14 +2941,13 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
PyErr_SetString(PyExc_RuntimeError, "invalid slot offset"); PyErr_SetString(PyExc_RuntimeError, "invalid slot offset");
goto fail; goto fail;
} }
if (slot->slot == Py_tp_base || slot->slot == Py_tp_bases) else if (slot->slot == Py_tp_base || slot->slot == Py_tp_bases) {
/* Processed above */ /* Processed above */
continue; continue;
*(void**)(res_start + slotoffsets[slot->slot]) = slot->pfunc; }
else if (slot->slot == Py_tp_doc) {
/* need to make a copy of the docstring slot, which usually /* For the docstring slot, which usually points to a static string
points to a static string literal */ literal, we need to make a copy */
if (slot->slot == Py_tp_doc) {
const char *old_doc = _PyType_DocWithoutSignature(type->tp_name, slot->pfunc); const char *old_doc = _PyType_DocWithoutSignature(type->tp_name, slot->pfunc);
size_t len = strlen(old_doc)+1; size_t len = strlen(old_doc)+1;
char *tp_doc = PyObject_MALLOC(len); char *tp_doc = PyObject_MALLOC(len);
@ -2960,13 +2959,16 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
memcpy(tp_doc, old_doc, len); memcpy(tp_doc, old_doc, len);
type->tp_doc = tp_doc; type->tp_doc = tp_doc;
} }
else if (slot->slot == Py_tp_members) {
/* Move the slots to the heap type itself */ /* Move the slots to the heap type itself */
if (slot->slot == Py_tp_members) {
size_t len = Py_TYPE(type)->tp_itemsize * nmembers; size_t len = Py_TYPE(type)->tp_itemsize * nmembers;
memcpy(PyHeapType_GET_MEMBERS(res), slot->pfunc, len); memcpy(PyHeapType_GET_MEMBERS(res), slot->pfunc, len);
type->tp_members = PyHeapType_GET_MEMBERS(res); type->tp_members = PyHeapType_GET_MEMBERS(res);
} }
else {
/* Copy other slots directly */
*(void**)(res_start + slotoffsets[slot->slot]) = slot->pfunc;
}
} }
if (type->tp_dealloc == NULL) { if (type->tp_dealloc == NULL) {
/* It's a heap type, so needs the heap types' dealloc. /* It's a heap type, so needs the heap types' dealloc.