Skip to content

bpo-46564: do not create frame object for super object #31002

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 5 commits into from
Feb 1, 2022
Merged

bpo-46564: do not create frame object for super object #31002

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49c5113
do not create frame object for super
kumaraditya303 Jan 29, 2022
2573827
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 1, 2022
3c5de54
style fix
kumaraditya303 Feb 1, 2022
a3bc1ab
Update Misc/NEWS.d/next/Core and Builtins/2022-02-01-10-23-21.bpo-465…
kumaraditya303 Feb 1, 2022
03cc71a
Update news
Fidget-Spinner Feb 1, 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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-02-01-10-23-21.bpo-46564.6Xc2_H.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not create frame objects for creating :class:`super` object. Patch by Kumar Aditya.
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
20 changes: 8 additions & 12 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9012,7 +9012,7 @@ super_descr_get(PyObject *self, PyObject *obj, PyObject *type)
}

static int
super_init_without_args(PyFrameObject *f, PyCodeObject *co,
super_init_without_args(InterpreterFrame *cframe, PyCodeObject *co,
PyTypeObject **type_p, PyObject **obj_p)
{
if (co->co_argcount == 0) {
Expand All @@ -9021,13 +9021,13 @@ super_init_without_args(PyFrameObject *f, PyCodeObject *co,
return -1;
}

assert(f->f_frame->f_code->co_nlocalsplus > 0);
PyObject *firstarg = _PyFrame_GetLocalsArray(f->f_frame)[0];
assert(cframe->f_code->co_nlocalsplus > 0);
PyObject *firstarg = _PyFrame_GetLocalsArray(cframe)[0];
// The first argument might be a cell.
if (firstarg != NULL && (_PyLocals_GetKind(co->co_localspluskinds, 0) & CO_FAST_CELL)) {
// "firstarg" is a cell here unless (very unlikely) super()
// was called from the C-API before the first MAKE_CELL op.
if (f->f_frame->f_lasti >= 0) {
if (cframe->f_lasti >= 0) {
assert(_Py_OPCODE(*co->co_firstinstr) == MAKE_CELL || _Py_OPCODE(*co->co_firstinstr) == COPY_FREE_VARS);
assert(PyCell_Check(firstarg));
firstarg = PyCell_GET(firstarg);
Expand All @@ -9047,7 +9047,7 @@ super_init_without_args(PyFrameObject *f, PyCodeObject *co,
PyObject *name = PyTuple_GET_ITEM(co->co_localsplusnames, i);
assert(PyUnicode_Check(name));
if (_PyUnicode_EqualToASCIIId(name, &PyId___class__)) {
PyObject *cell = _PyFrame_GetLocalsArray(f->f_frame)[i];
PyObject *cell = _PyFrame_GetLocalsArray(cframe)[i];
if (cell == NULL || !PyCell_Check(cell)) {
PyErr_SetString(PyExc_RuntimeError,
"super(): bad __class__ cell");
Expand Down Expand Up @@ -9096,17 +9096,13 @@ super_init(PyObject *self, PyObject *args, PyObject *kwds)
/* Call super(), without args -- fill in from __class__
and first local variable on the stack. */
PyThreadState *tstate = _PyThreadState_GET();
PyFrameObject *frame = PyThreadState_GetFrame(tstate);
if (frame == NULL) {
InterpreterFrame *cframe = tstate->cframe->current_frame;
if (cframe == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"super(): no current frame");
return -1;
}

PyCodeObject *code = PyFrame_GetCode(frame);
int res = super_init_without_args(frame, code, &type, &obj);
Py_DECREF(frame);
Py_DECREF(code);
int res = super_init_without_args(cframe, cframe->f_code, &type, &obj);

if (res < 0) {
return -1;
Expand Down