Skip to content

GH-120024: Use pointer for stack pointer #121923

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 3 commits into from
Jul 18, 2024
Merged

GH-120024: Use pointer for stack pointer #121923

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40abc6b
Convert stacktop to pointer
markshannon May 31, 2024
26a4fd7
Fix up testcapi.frame_getvar
markshannon Jul 17, 2024
36f02e4
Update test_sys
markshannon Jul 17, 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
Fix up testcapi.frame_getvar
  • Loading branch information
@markshannon
markshannon committed Jul 17, 2024
commit 26a4fd718f7792787e56f4748c5b91d0213a9736
8 changes: 3 additions & 5 deletions Objects/frameobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,8 +1882,9 @@ frame_get_var(_PyInterpreterFrame *frame, PyCodeObject *co, int i,
return 0;
}

PyObject *value = PyStackRef_AsPyObjectBorrow(frame->localsplus[i]);
if (frame->stackpointer > frame->localsplus) {
PyObject *value = NULL;
if (frame->stackpointer == NULL || frame->stackpointer > frame->localsplus + i) {
value = PyStackRef_AsPyObjectBorrow(frame->localsplus[i]);
if (kind & CO_FAST_FREE) {
// The cell was set by COPY_FREE_VARS.
assert(value != NULL && PyCell_Check(value));
Expand All @@ -1901,9 +1902,6 @@ frame_get_var(_PyInterpreterFrame *frame, PyCodeObject *co, int i,
}
}
}
else {
assert(value == NULL);
}
*pvalue = value;
return 1;
}
Expand Down