Skip to content

GH-93897: Store frame size in code object and de-opt if insufficient space on thread frame stack. #93908

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 6 commits into from
Jun 20, 2022
Merged

GH-93897: Store frame size in code object and de-opt if insufficient space on thread frame stack. #93908

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1235fe
Streamline pushing frames, by deopting if insufficient space.
markshannon Jun 16, 2022
6f7b085
Move NULL check and incref off the fast path.
markshannon Jun 16, 2022
5fdd7f8
Use size in frame space check. Allows multiple frames to be checked a…
markshannon Jun 16, 2022
38e04b5
DRY stats call.
markshannon Jun 16, 2022
13d480a
Merge branch 'main' into store-code-size
markshannon Jun 16, 2022
80ebbfc
Merge branch 'main' into store-code-size
markshannon Jun 17, 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 branch 'main' into store-code-size
  • Loading branch information
@markshannon
markshannon committed Jun 17, 2022
commit 80ebbfcab3e01ffba3c8f8699adafe40716a19b3
7 changes: 2 additions & 5 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3662,13 +3662,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(f->func_version != func_version, LOAD_ATTR);
PyCodeObject *code = (PyCodeObject *)f->func_code;
assert(code->co_argcount == 1);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), LOAD_ATTR);
STAT_INC(LOAD_ATTR, hit);

Py_INCREF(fget);
_PyInterpreterFrame *new_frame = _PyFrame_Push(tstate, f);
if (new_frame == NULL) {
goto error;
}
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, f);
SET_TOP(NULL);
int push_null = !(oparg & 1);
STACK_SHRINK(push_null);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.