Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-108991: replace _PyFrame_GetState by two simpler functions (#108992)

This commit is contained in:
Irit Katriel 2023-09-06 12:54:59 +01:00 committed by GitHub
parent 5f3433f210
commit 39376cb93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Objects/frameobject.c
View File

@ -591,39 +591,28 @@ first_line_not_before(int *lines, int len, int line)
return result; return result;
} }
static PyFrameState static bool
_PyFrame_GetState(PyFrameObject *frame) frame_is_cleared(PyFrameObject *frame)
{ {
assert(!_PyFrame_IsIncomplete(frame->f_frame)); assert(!_PyFrame_IsIncomplete(frame->f_frame));
if (frame->f_frame->stacktop == 0) { if (frame->f_frame->stacktop == 0) {
return FRAME_CLEARED; return true;
} }
switch(frame->f_frame->owner) { if (frame->f_frame->owner == FRAME_OWNED_BY_GENERATOR) {
case FRAME_OWNED_BY_GENERATOR: PyGenObject *gen = _PyFrame_GetGenerator(frame->f_frame);
{ return gen->gi_frame_state == FRAME_CLEARED;
PyGenObject *gen = _PyFrame_GetGenerator(frame->f_frame);
return gen->gi_frame_state;
}
case FRAME_OWNED_BY_THREAD:
{
if (_PyInterpreterFrame_LASTI(frame->f_frame) < 0) {
return FRAME_CREATED;
}
switch (frame->f_frame->prev_instr->op.code)
{
case COPY_FREE_VARS:
case MAKE_CELL:
case RETURN_GENERATOR:
/* Frame not fully initialized */
return FRAME_CREATED;
default:
return FRAME_EXECUTING;
}
}
case FRAME_OWNED_BY_FRAME_OBJECT:
return FRAME_COMPLETED;
} }
Py_UNREACHABLE(); return false;
}
static bool frame_is_suspended(PyFrameObject *frame)
{
assert(!_PyFrame_IsIncomplete(frame->f_frame));
if (frame->f_frame->owner == FRAME_OWNED_BY_GENERATOR) {
PyGenObject *gen = _PyFrame_GetGenerator(frame->f_frame);
return gen->gi_frame_state == FRAME_SUSPENDED;
}
return false;
} }
/* Setter for f_lineno - you can set f_lineno from within a trace function in /* Setter for f_lineno - you can set f_lineno from within a trace function in
@ -655,7 +644,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
return -1; return -1;
} }
PyFrameState state = _PyFrame_GetState(f); bool is_suspended = frame_is_suspended(f);
/* /*
* This code preserves the historical restrictions on * This code preserves the historical restrictions on
* setting the line number of a frame. * setting the line number of a frame.
@ -811,7 +800,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
} }
assert(unbound == 0); assert(unbound == 0);
} }
if (state == FRAME_SUSPENDED) { if (is_suspended) {
/* Account for value popped by yield */ /* Account for value popped by yield */
start_stack = pop_value(start_stack); start_stack = pop_value(start_stack);
} }
@ -1455,7 +1444,7 @@ void
PyFrame_LocalsToFast(PyFrameObject *f, int clear) PyFrame_LocalsToFast(PyFrameObject *f, int clear)
{ {
assert(!_PyFrame_IsIncomplete(f->f_frame)); assert(!_PyFrame_IsIncomplete(f->f_frame));
if (f && f->f_fast_as_locals && _PyFrame_GetState(f) != FRAME_CLEARED) { if (f && f->f_fast_as_locals && !frame_is_cleared(f)) {
_PyFrame_LocalsToFast(f->f_frame, clear); _PyFrame_LocalsToFast(f->f_frame, clear);
f->f_fast_as_locals = 0; f->f_fast_as_locals = 0;
} }