Skip to content

bpo-40421: Add missing getters for frame object attributes to C-API. #32114

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 18 commits into from
Mar 31, 2022
Merged

bpo-40421: Add missing getters for frame object attributes to C-API. #32114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
62be414
`PyFrame_FastToLocalsWithError` and `PyFrame_LocalsToFast` are no lon…
markshannon Mar 22, 2022
d775a87
Fix formatting of news item.
markshannon Mar 22, 2022
4bc0707
Make accesses to a frame's `f_locals` safe from C code, not relying o…
markshannon Mar 23, 2022
4cf7efa
Remove unnecessary check for CO_NEWLOCALS flag.
markshannon Mar 23, 2022
d41f7ea
Remove empty line
markshannon Mar 23, 2022
723f354
Update 'what's new'
markshannon Mar 23, 2022
02f061a
Use nicer formatting
markshannon Mar 23, 2022
281305b
Fix formatting
markshannon Mar 23, 2022
8d3c911
Update Misc/NEWS.d/next/Core and Builtins/2022-03-22-15-12-28.bpo-421…
markshannon Mar 23, 2022
56aa001
Merge branch 'main' into dont-call-fasttolocals-all-the-time
markshannon Mar 23, 2022
0e452a1
Document new `PyFrame_GetLocals` C-API function.
markshannon Mar 23, 2022
b5e8004
Add accessor functions for frame attributes that can longer be access…
markshannon Mar 23, 2022
a2a40d3
Merge branch 'main' into flesh-out-frame-c-api
markshannon Mar 25, 2022
2a43da7
Add news and update whatsnew
markshannon Mar 25, 2022
4882efd
Add tests for new C-API functions and fix refcount error.
markshannon Mar 25, 2022
2977bb1
Merge branch 'main' into flesh-out-frame-c-api
markshannon Mar 28, 2022
b736e3f
Merge branch 'main' into flesh-out-frame-c-api
markshannon Mar 30, 2022
4874e2f
Merge branch 'main' into flesh-out-frame-c-api
markshannon Mar 31, 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
Next Next commit
PyFrame_FastToLocalsWithError and PyFrame_LocalsToFast are no lon… 
…ger called during profile and tracing.

 (Contributed by Fabio Zadrozny)
  • Loading branch information
@markshannon
markshannon committed Mar 22, 2022
commit 62be414a95d0f7981d1ec66aa9be25a1762f53e5
5 changes: 5 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-03-22-15-12-28.bpo-42197.SwrrFO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
`PyFrame_FastToLocalsWithError` and `PyFrame_LocalsToFast` are no longer
called during profile nor tracing. C code that accesses the `f_locals` directly
(which is not recommended) must now call
`PyFrame_FastToLocalsWithError` to update locals and `PyFrame_LocalsToFast`
after `PyFrameObject.f_locals` are updated.
7 changes: 0 additions & 7 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,9 +924,6 @@ static PyObject *
call_trampoline(PyThreadState *tstate, PyObject* callback,
PyFrameObject *frame, int what, PyObject *arg)
{
if (PyFrame_FastToLocalsWithError(frame) < 0) {
return NULL;
}

PyObject *stack[3];
stack[0] = (PyObject *)frame;
Expand All @@ -936,10 +933,6 @@ call_trampoline(PyThreadState *tstate, PyObject* callback,
/* call the Python-level function */
PyObject *result = _PyObject_FastCallTstate(tstate, callback, stack, 3);

PyFrame_LocalsToFast(frame, 1);
if (result == NULL) {
PyTraceBack_Here(frame);
}

return result;
}
Expand Down