Skip to content

gh-93911: Specialize LOAD_ATTR for custom __getattr__ and __getattribute__ #93988

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
markshannon merged 21 commits into from
Aug 17, 2022
Merged

gh-93911: Specialize LOAD_ATTR for custom __getattr__ and __getattribute__ #93988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2f483f5
Specialize LOAD_ATTR for custom __getattr__
Fidget-Spinner Jun 18, 2022
de5aab9
fix up comments
Fidget-Spinner Jun 18, 2022
a795602
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 18, 2022
b170204
fix version tag issues
Fidget-Spinner Jun 18, 2022
b4df543
update specialization failure name
Fidget-Spinner Jun 18, 2022
cd81fa9
fix getattr bug
Fidget-Spinner Jun 18, 2022
a2b0121
Fix type size in test_sys
Fidget-Spinner Jun 18, 2022
b0caba5
Merge remote-tracking branch 'upstream/main' into specialize_overridden
Fidget-Spinner Jun 27, 2022
2a931a8
Use Mark's suggestions
Fidget-Spinner Jun 27, 2022
dd89339
fix test_sys
Fidget-Spinner Jun 27, 2022
40e363b
Merge remote-tracking branch 'upstream/main' into specialize_overridden
Fidget-Spinner Jun 30, 2022
db13262
address review
Fidget-Spinner Jun 30, 2022
0185748
Merge remote-tracking branch 'upstream/main' into specialize_overridden
Fidget-Spinner Jul 20, 2022
cab77d8
revert rename
Fidget-Spinner Jul 20, 2022
81adecb
remove unsued failures
Fidget-Spinner Jul 20, 2022
6845656
Address code review
Fidget-Spinner Jul 20, 2022
9412f97
Use Mark's code
Fidget-Spinner Jul 20, 2022
c6f8610
Clean up code a little
Fidget-Spinner Jul 20, 2022
d887293
Merge remote-tracking branch 'upstream/main' into specialize_overridden
Fidget-Spinner Aug 14, 2022
cb7d01e
Update pycore_opcode.h
Fidget-Spinner Aug 14, 2022
def326e
Address review, make things more restrictive
Fidget-Spinner Aug 16, 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
revert rename
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jul 20, 2022
commit cab77d8e2965b454c53304fdb0d85c8f93f574d5
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 @@ -46,7 +46,7 @@ extern void _PyStaticType_Dealloc(PyTypeObject *type);

PyObject *_Py_slot_tp_getattro(PyObject *self, PyObject *name);
PyObject *_Py_slot_tp_getattr_hook(PyObject *self, PyObject *name);
PyObject *_Py_call_attribute(PyObject *self, PyObject *attr, PyObject *name);

#ifdef __cplusplus
}
#endif
Expand Down
12 changes: 6 additions & 6 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7784,8 +7784,8 @@ _Py_slot_tp_getattro(PyObject *self, PyObject *name)
return vectorcall_method(&_Py_ID(__getattribute__), stack, 2);
}

PyObject *
_Py_call_attribute(PyObject *self, PyObject *attr, PyObject *name)
static inline PyObject *
call_attribute(PyObject *self, PyObject *attr, PyObject *name)
{
PyObject *res, *descr = NULL;

Expand Down Expand Up @@ -7819,7 +7819,7 @@ _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name)
method fully for each attribute lookup for classes with
__getattr__, even when the attribute is present. So we use
_PyType_Lookup and create the method only when needed, with
_Py_call_attribute. */
call_attribute. */
getattr = _PyType_Lookup(tp, &_Py_ID(__getattr__));
if (getattr == NULL) {
/* No __getattr__ hook: use a simpler dispatcher */
Expand All @@ -7831,7 +7831,7 @@ _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name)
method fully for each attribute lookup for classes with
__getattr__, even when self has the default __getattribute__
method. So we use _PyType_Lookup and create the method only when
needed, with _Py_call_attribute. */
needed, with call_attribute. */
getattribute = _PyType_Lookup(tp, &_Py_ID(__getattribute__));
if (getattribute == NULL ||
(Py_IS_TYPE(getattribute, &PyWrapperDescr_Type) &&
Expand All @@ -7840,12 +7840,12 @@ _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name)
res = PyObject_GenericGetAttr(self, name);
else {
Py_INCREF(getattribute);
res = _Py_call_attribute(self, getattribute, name);
res = call_attribute(self, getattribute, name);
Py_DECREF(getattribute);
}
if (res == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
res = _Py_call_attribute(self, getattr, name);
res = call_attribute(self, getattr, name);
}
Py_DECREF(getattr);
return res;
Expand Down