Skip to content

gh-124153: Clean up workarounds for PyType_GetBaseByToken() performance #124323

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

Closed
neonene wants to merge 7 commits into from
Closed

gh-124153: Clean up workarounds for PyType_GetBaseByToken() performance #124323

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
04b2381
abandon if-else chains for maintainability
neonene Sep 22, 2024
c2cabd1
add forward declarations
neonene Sep 22, 2024
ead4411
move down get_base_by_token_from_mro()
neonene Sep 22, 2024
7349f97
move down check_base_by_token()
neonene Sep 22, 2024
f938abc
move down get_base_by_token_recursive()
neonene Sep 22, 2024
516d2fb
add again a comment about gotos
neonene Sep 23, 2024
3783982
Merge branch 'main' into bytokens
neonene Sep 24, 2024
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
move down get_base_by_token_from_mro()
  • Loading branch information
@neonene
neonene authored Sep 22, 2024
commit ead4411232161a65222887ebdfc4c8b14e05c19b
54 changes: 27 additions & 27 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5323,33 +5323,6 @@ get_base_by_token_recursive(PyTypeObject *type, void *token)
return NULL;
}

static inline PyTypeObject *
get_base_by_token_from_mro(PyTypeObject *type, void *token)
{
// Bypass lookup_tp_mro() as PyType_IsSubtype() does
PyObject *mro = type->tp_mro;
assert(mro != NULL);
assert(PyTuple_Check(mro));
// mro_invoke() ensures that the type MRO cannot be empty.
assert(PyTuple_GET_SIZE(mro) >= 1);
// Also, the first item in the MRO is the type itself, which is supposed
// to be already checked by the caller. We skip it in the loop.
assert(PyTuple_GET_ITEM(mro, 0) == (PyObject *)type);
assert(PyType_GetSlot(type, Py_tp_token) != token);

Py_ssize_t n = PyTuple_GET_SIZE(mro);
for (Py_ssize_t i = 1; i < n; i++) {
PyTypeObject *base = _PyType_CAST(PyTuple_GET_ITEM(mro, i));
if (!_PyType_HasFeature(base, Py_TPFLAGS_HEAPTYPE)) {
continue;
}
if (((PyHeapTypeObject*)base)->ht_token == token) {
return base;
}
}
return NULL;
}

static int
check_base_by_token(PyTypeObject *type, void *token) {
if (token == NULL) {
Expand Down Expand Up @@ -5420,6 +5393,33 @@ PyType_GetBaseByToken(PyTypeObject *type, void *token, PyTypeObject **result)
}
}

static inline PyTypeObject *
get_base_by_token_from_mro(PyTypeObject *type, void *token)
{
// Bypass lookup_tp_mro() as PyType_IsSubtype() does
PyObject *mro = type->tp_mro;
assert(mro != NULL);
assert(PyTuple_Check(mro));
// mro_invoke() ensures that the type MRO cannot be empty.
assert(PyTuple_GET_SIZE(mro) >= 1);
// Also, the first item in the MRO is the type itself, which is supposed
// to be already checked by the caller. We skip it in the loop.
assert(PyTuple_GET_ITEM(mro, 0) == (PyObject *)type);
assert(PyType_GetSlot(type, Py_tp_token) != token);

Py_ssize_t n = PyTuple_GET_SIZE(mro);
for (Py_ssize_t i = 1; i < n; i++) {
PyTypeObject *base = _PyType_CAST(PyTuple_GET_ITEM(mro, i));
if (!_PyType_HasFeature(base, Py_TPFLAGS_HEAPTYPE)) {
continue;
}
if (((PyHeapTypeObject*)base)->ht_token == token) {
return base;
}
}
return NULL;
}


void *
PyObject_GetTypeData(PyObject *obj, PyTypeObject *cls)
Expand Down