Skip to content

gh-92216: improve performance of hasattr for type objects #99979

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
Fidget-Spinner merged 9 commits into from
Dec 23, 2022
Merged

gh-92216: improve performance of hasattr for type objects #99979

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ef4b4b
improve performance of hasattr for type objects
eendebakpt Dec 4, 2022
8f0f472
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 4, 2022
5322a2a
Merge branch 'main' into type_hasattr
eendebakpt Dec 13, 2022
c689b92
Merge branch 'main' into type_hasattr
eendebakpt Dec 15, 2022
9157e1b
fix merge conflict
eendebakpt Dec 18, 2022
2c91bb4
Merge branch 'main' into type_hasattr
eendebakpt Dec 18, 2022
fa39a8e
address review comments
eendebakpt Dec 23, 2022
ed3e023
add docstring
eendebakpt Dec 23, 2022
1d15a74
update docstring
eendebakpt Dec 23, 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
add docstring
  • Loading branch information
@eendebakpt
eendebakpt committed Dec 23, 2022
commit ed3e02349433c0d702e3e0185826274138755be0
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 @@ -75,7 +75,7 @@ extern void _PyStaticType_ClearWeakRefs(PyTypeObject *type);
extern void _PyStaticType_Dealloc(PyTypeObject *type);

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

Expand Down
18 changes: 14 additions & 4 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4219,9 +4219,19 @@ _PyType_LookupId(PyTypeObject *type, _Py_Identifier *name)
}

/* This is similar to PyObject_GenericGetAttr(),
but uses _PyType_Lookup() instead of just looking in type->tp_dict. */
but uses _PyType_Lookup() instead of just looking in type->tp_dict.

The argument suppress_missing_attribute is used to provide a
fast path for hasattr. The modes are:

* NULL: do not suppress the exception
* Non-zero pointer: suppress the PyExc_AttributeError and set
*suppress_missing_attribute to 1 to signal we are returning NULL while
having suppressed the exception (other exceptions are not suppressed)

*/
PyObject *
_Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int *suppress)
_Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int * suppress_missing_attribute)
{
PyTypeObject *metatype = Py_TYPE(type);
PyObject *meta_attribute, *attribute;
Expand Down Expand Up @@ -4301,13 +4311,13 @@ _Py_type_getattro_impl(PyTypeObject *type, PyObject *name, int *suppress)
}

/* Give up */
if (suppress == NULL) {
if (suppress_missing_attribute == NULL) {
PyErr_Format(PyExc_AttributeError,
"type object '%.50s' has no attribute '%U'",
type->tp_name, name);
} else {
// signal the caller we have not set an PyExc_AttributeError and gave up
*suppress = 1;
*suppress_missing_attribute = 1;
}
return NULL;
}
Expand Down