mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
gh-111354: remove comparisons with enum values, variable reuse, unused imports in genobject.c (#111708)
This commit is contained in:
parent
97c4c06d0d
commit
30ec968bef
|
@ -45,6 +45,7 @@ typedef enum _framestate {
|
|||
} PyFrameState;
|
||||
|
||||
#define FRAME_STATE_SUSPENDED(S) ((S) == FRAME_SUSPENDED || (S) == FRAME_SUSPENDED_YIELD_FROM)
|
||||
#define FRAME_STATE_FINISHED(S) ((S) >= FRAME_COMPLETED)
|
||||
|
||||
enum _frameowner {
|
||||
FRAME_OWNED_BY_THREAD = 0,
|
||||
|
|
|
@ -9,13 +9,10 @@
|
|||
#include "pycore_genobject.h" // struct _Py_async_gen_state
|
||||
#include "pycore_modsupport.h" // _PyArg_CheckPositional()
|
||||
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
|
||||
#include "pycore_opcode_metadata.h" // _PyOpcode_Caches
|
||||
#include "pycore_opcode_utils.h" // RESUME_AFTER_YIELD_FROM
|
||||
#include "pycore_pyerrors.h" // _PyErr_ClearExcState()
|
||||
#include "pycore_pystate.h" // _PyThreadState_GET()
|
||||
|
||||
#include "opcode.h" // SEND
|
||||
#include "frameobject.h" // _PyInterpreterFrame_GetLine
|
||||
#include "pystats.h"
|
||||
|
||||
static PyObject *gen_close(PyGenObject *, PyObject *);
|
||||
|
@ -43,19 +40,12 @@ PyGen_GetCode(PyGenObject *gen) {
|
|||
return res;
|
||||
}
|
||||
|
||||
static inline int
|
||||
exc_state_traverse(_PyErr_StackItem *exc_state, visitproc visit, void *arg)
|
||||
{
|
||||
Py_VISIT(exc_state->exc_value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
gen_traverse(PyGenObject *gen, visitproc visit, void *arg)
|
||||
{
|
||||
Py_VISIT(gen->gi_name);
|
||||
Py_VISIT(gen->gi_qualname);
|
||||
if (gen->gi_frame_state < FRAME_CLEARED) {
|
||||
if (gen->gi_frame_state != FRAME_CLEARED) {
|
||||
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)(gen->gi_iframe);
|
||||
assert(frame->frame_obj == NULL ||
|
||||
frame->frame_obj->f_frame->owner == FRAME_OWNED_BY_GENERATOR);
|
||||
|
@ -66,7 +56,8 @@ gen_traverse(PyGenObject *gen, visitproc visit, void *arg)
|
|||
}
|
||||
/* No need to visit cr_origin, because it's just tuples/str/int, so can't
|
||||
participate in a reference cycle. */
|
||||
return exc_state_traverse(&gen->gi_exc_state, visit, arg);
|
||||
Py_VISIT(gen->gi_exc_state.exc_value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -74,7 +65,7 @@ _PyGen_Finalize(PyObject *self)
|
|||
{
|
||||
PyGenObject *gen = (PyGenObject *)self;
|
||||
|
||||
if (gen->gi_frame_state >= FRAME_COMPLETED) {
|
||||
if (FRAME_STATE_FINISHED(gen->gi_frame_state)) {
|
||||
/* Generator isn't paused, so no need to close */
|
||||
return;
|
||||
}
|
||||
|
@ -147,7 +138,7 @@ gen_dealloc(PyGenObject *gen)
|
|||
and GC_Del. */
|
||||
Py_CLEAR(((PyAsyncGenObject*)gen)->ag_origin_or_finalizer);
|
||||
}
|
||||
if (gen->gi_frame_state < FRAME_CLEARED) {
|
||||
if (gen->gi_frame_state != FRAME_CLEARED) {
|
||||
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
||||
gen->gi_frame_state = FRAME_CLEARED;
|
||||
frame->previous = NULL;
|
||||
|
@ -171,7 +162,6 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
|
|||
{
|
||||
PyThreadState *tstate = _PyThreadState_GET();
|
||||
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)gen->gi_iframe;
|
||||
PyObject *result;
|
||||
|
||||
*presult = NULL;
|
||||
if (gen->gi_frame_state == FRAME_CREATED && arg && arg != Py_None) {
|
||||
|
@ -198,7 +188,7 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
|
|||
PyErr_SetString(PyExc_ValueError, msg);
|
||||
return PYGEN_ERROR;
|
||||
}
|
||||
if (gen->gi_frame_state >= FRAME_COMPLETED) {
|
||||
if (FRAME_STATE_FINISHED(gen->gi_frame_state)) {
|
||||
if (PyCoro_CheckExact(gen) && !closing) {
|
||||
/* `gen` is an exhausted coroutine: raise an error,
|
||||
except when called from gen_close(), which should
|
||||
|
@ -216,10 +206,12 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
|
|||
return PYGEN_ERROR;
|
||||
}
|
||||
|
||||
assert(gen->gi_frame_state < FRAME_EXECUTING);
|
||||
assert((gen->gi_frame_state == FRAME_CREATED) ||
|
||||
FRAME_STATE_SUSPENDED(gen->gi_frame_state));
|
||||
|
||||
/* Push arg onto the frame's value stack */
|
||||
result = arg ? arg : Py_None;
|
||||
_PyFrame_StackPush(frame, Py_NewRef(result));
|
||||
PyObject *arg_obj = arg ? arg : Py_None;
|
||||
_PyFrame_StackPush(frame, Py_NewRef(arg_obj));
|
||||
|
||||
_PyErr_StackItem *prev_exc_info = tstate->exc_info;
|
||||
gen->gi_exc_state.previous_item = prev_exc_info;
|
||||
|
@ -232,7 +224,7 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
|
|||
|
||||
gen->gi_frame_state = FRAME_EXECUTING;
|
||||
EVAL_CALL_STAT_INC(EVAL_CALL_GENERATOR);
|
||||
result = _PyEval_EvalFrame(tstate, frame, exc);
|
||||
PyObject *result = _PyEval_EvalFrame(tstate, frame, exc);
|
||||
assert(tstate->exc_info == prev_exc_info);
|
||||
assert(gen->gi_exc_state.previous_item == NULL);
|
||||
assert(gen->gi_frame_state != FRAME_EXECUTING);
|
||||
|
@ -366,7 +358,7 @@ gen_close(PyGenObject *gen, PyObject *args)
|
|||
gen->gi_frame_state = FRAME_COMPLETED;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
if (gen->gi_frame_state >= FRAME_COMPLETED) {
|
||||
if (FRAME_STATE_FINISHED(gen->gi_frame_state)) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
PyObject *yf = _PyGen_yf(gen);
|
||||
|
@ -2095,7 +2087,7 @@ async_gen_athrow_send(PyAsyncGenAThrow *o, PyObject *arg)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (gen->gi_frame_state >= FRAME_COMPLETED) {
|
||||
if (FRAME_STATE_FINISHED(gen->gi_frame_state)) {
|
||||
o->agt_state = AWAITABLE_STATE_CLOSED;
|
||||
PyErr_SetNone(PyExc_StopIteration);
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in a new issue