10000 bpo-43693: Eliminate unused "fast locals". by ericsnowcurrently · Pull Request #26587 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43693: Eliminate unused "fast locals". #26587

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
merged 10 commits into from
Jun 15, 2021
Merged

bpo-43693: Eliminate unused "fast locals". #26587

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d63f73e
Merge cell locals with var locals for args.
ericsnowcurrently May 10, 2021
db2fd06
Eliminate co_cell2arg.
ericsnowcurrently May 10, 2021
6cae5e0
Add a NEWS entry.
ericsnowcurrently Jun 7, 2021
b5ef8e1
Bump the .pyc magic number.
ericsnowcurrently Jun 9, 2021
0e1cbc4
Drop an expensive check from super_init_without_args().
ericsnowcurrently Jun 15, 2021
2ec5ae4
Do not export _PyFrame_OpAlreadyRan().
ericsnowcurrently Jun 15, 2021
4b086e9
Check only the free vars in super_init_without_args().
ericsnowcurrently Jun 15, 2021
09c3cdd
Simplify a comment.
ericsnowcurrently Jun 15, 2021
8693744
Sort the MAKE_CELL ops by oparg.
ericsnowcurrently Jun 15, 2021
bdb12a7
Add a light-weight check to super_init_without_args().
ericsnowcurrently Jun 15, 2021
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
Drop an expensive check from super_init_without_args().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jun 15, 2021
commit 0e1cbc48c38becd8b13ad26fc3e956d64729e186
24 changes: 15 additions & 9 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_unionobject.h" // _Py_Union(), _Py_union_type_or
#include "frameobject.h"
#include "pycore_frame.h" // _PyFrame_OpAlreadyRan()
#include "opcode.h" // MAKE_CELL
#include "structmember.h" // PyMemberDef

Expand Down Expand Up @@ -8878,14 +8877,21 @@ super_init_without_args(PyFrameObject *f, PyCodeObject *co,
return -1;
}

PyObject *obj = f->f_localsptr[0];
PyObject *firstarg = f->f_localsptr[0];
// The first argument might be a cell.
if (obj != NULL && (co->co_localspluskinds[0] & CO_FAST_CELL)) {
if (PyCell_Check(obj) && _PyFrame_OpAlreadyRan(f, MAKE_CELL, 0)) {
obj = PyCell_GET(obj);
}
}
if (obj == NULL) {
if (firstarg != NULL && (co->co_localspluskinds[0] & CO_FAST_CELL)) {
// The only way firstarg is not a cell is if MAKE_CELL hasn't
// run yet, which isn't possible from Python code since "super()"
// will always come after MAKE_CELL. So the only way firstarg
// isn't a cell is if super() were called via the C-API, and
// execution is at the very beginning of the function. This is
// sufficiently unlikely that we disllow it. Otherwise we'd
// incur the expense of checking to make sure MAKE_CELL ran
// already, like we do in PyFrame_FastToLocals().
assert(PyCell_Check(firstarg));
firstarg = PyCell_GET(firstarg);
}
if (firstarg == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"super(): arg[0] deleted");
return -1;
Expand Down Expand Up @@ -8928,7 +8934,7 @@ super_init_without_args(PyFrameObject *f, PyCodeObject *co,
}

*type_p = type;
*obj_p = obj;
*obj_p = firstarg;
return 0;
}

Expand Down
0