Skip to content

bpo-44800: unobtrusively rename _PyInterpreterFrame to _Py_frame #32024

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
ncoghlan wants to merge 12 commits into from
Closed

bpo-44800: unobtrusively rename _PyInterpreterFrame to _Py_frame #32024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
70d2322
bpo-44800: Rename _PyInterpreterFrame to _Py_frame
ncoghlan Mar 19, 2022
28402ec
Fix misleading use of 'cframe' name in typeobject.c
ncoghlan Mar 19, 2022
90664e6
f_frame is not public, don't mention in What's New
ncoghlan Mar 19, 2022
9dced1f
Add NEWS entry
ncoghlan Mar 19, 2022
f20b1f9
Fix another use of cframe in typeoject.c
ncoghlan Mar 19, 2022
a8d3c9e
ReST is not Markdown
ncoghlan Mar 19, 2022
32c224f
Compatibility workaround to match 3.11a6 API
ncoghlan Mar 20, 2022
dda99b3
Update comments for scaled back proposal
ncoghlan Mar 21, 2022
c725c6b
No aliases to check now
ncoghlan Mar 21, 2022
9526ce0
Adjust NEWS entry
ncoghlan Mar 21, 2022
0acb559
Fix typo in comment
ncoghlan Mar 21, 2022
763a615
Merge remote-tracking branch 'origin/main' into bpo-44800-py-frame-mi…
ncoghlan Mar 21, 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
Merge remote-tracking branch 'origin/main' into bpo-44800-py-frame-mi… 
…nimal-changes
  • Loading branch information
@ncoghlan
ncoghlan committed Mar 21, 2022
commit 763a615a20eade7cd0472c08375069da54b3ea7b
4 changes: 1 addition & 3 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,7 @@ _PyGen_yf(PyGenObject *gen)
PyObject *yf = NULL;

if (gen->gi_frame_valid) {
_Py_frame *frame = (_Py_frame *)gen->gi_iframe;
PyObject *bytecode = gen->gi_code->co_code;
unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode);
_Py_frame *frame = (_PyInterpreterFrame *)gen->gi_iframe;

if (frame->f_lasti < 1) {
/* Return immediately if the frame didn't start yet. SEND
Expand Down
5 changes: 4 additions & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8949,7 +8949,10 @@ super_init_without_args(_Py_frame *frame, PyCodeObject *co,
// "firstarg" is a cell here unless (very unlikely) super()
// was called from the C-API before the first MAKE_CELL op.
if (frame->f_lasti >= 0) {
assert(_Py_OPCODE(*co->co_firstinstr) == MAKE_CELL || _Py_OPCODE(*co->co_firstinstr) == COPY_FREE_VARS);
// MAKE_CELL and COPY_FREE_VARS have no quickened forms, so no need
// to use _PyOpcode_Deopt here:
assert(_Py_OPCODE(_PyCode_CODE(co)[0]) == MAKE_CELL ||
_Py_OPCODE(_PyCode_CODE(co)[0]) == COPY_FREE_VARS);
assert(PyCell_Check(firstarg));
firstarg = PyCell_GET(firstarg);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.