10000 gh-123923: Defer refcounting for `f_funcobj` in `_PyInterpreterFrame` by colesbury · Pull Request #124026 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-123923: Defer refcounting for f_funcobj in _PyInterpreterFrame #124026

8000
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 6 commits into from
Sep 24, 2024
Merged

gh-123923: Defer refcounting for f_funcobj in _PyInterpreterFrame #124026

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db12634
gh-123923: Defer refcounting for `f_funcobj` in `_PyInterpreterFrame`
colesbury Sep 11, 2024
963896a
Fix tier2 optimizer
colesbury Sep 12, 2024
68d360e
Merge branch 'main' into gh-123923-defer-func
colesbury Sep 14, 2024
cd3d83d
Simplify code after merge
colesbury Sep 14, 2024
6a1014f
Merge branch 'main' into gh-123923-defer-func
colesbury Sep 20, 2024
2fde56d
Merge branch 'main' into gh-123923-defer-func
colesbury Sep 24, 2024
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
Merge branch 'main' into gh-123923-defer-func
  • Loading branch information
@colesbury
colesbury authored Sep 14, 2024
commit 68d360e5ed80819780114c7d1881934a9f59b22c
12 changes: 10 additions & 2 deletions Python/gc_free_threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,17 @@ frame_disable_deferred_refcounting(_PyInterpreterFrame *frame, int is_funcobj_va
frame->owner == FRAME_OWNED_BY_GENERATOR);

frame->f_executable = PyStackRef_AsStrongReference(frame->f_executable);
if (is_funcobj_valid) {
frame->f_funcobj = PyStackRef_AsStrongReference(frame->f_funcobj);

if (frame->owner == FRAME_OWNED_BY_GENERATOR) {
PyGenObject *gen = _PyGen_GetGeneratorFromFrame(frame);
if (gen->gi_frame_state == FRAME_CLEARED) {
// gh-124068: if the generator is cleared, then most fields other
// than f_executable are not valid.
return;
}
}

frame->f_funcobj = PyStackRef_AsStrongReference(frame->f_funcobj);
for (_PyStackRef *ref = frame->localsplus; ref < frame->stackpointer; ref++) {
if (!PyStackRef_IsNull(*ref) && PyStackRef_IsDeferred(*ref)) {
*ref = PyStackRef_AsStrongReference(*ref);
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.
0