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

gh-111354: define names for RESUME oparg values (#111365)

This commit is contained in:
Irit Katriel 2023-10-26 16:30:18 +01:00 committed by GitHub
parent 309efb39dc
commit a0c414c35d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/internal/pycore_opcode_utils.h
View File

@ -58,6 +58,12 @@ extern "C" {
#define MAKE_FUNCTION_ANNOTATIONS 0x04 #define MAKE_FUNCTION_ANNOTATIONS 0x04
#define MAKE_FUNCTION_CLOSURE 0x08 #define MAKE_FUNCTION_CLOSURE 0x08
/* Values used in the oparg for RESUME */
#define RESUME_AT_FUNC_START 0
#define RESUME_AFTER_YIELD 1
#define RESUME_AFTER_YIELD_FROM 2
#define RESUME_AFTER_AWAIT 3
#ifdef __cplusplus #ifdef __cplusplus
} }

3
Objects/genobject.c
View File

@ -10,6 +10,7 @@
#include "pycore_modsupport.h" // _PyArg_CheckPositional() #include "pycore_modsupport.h" // _PyArg_CheckPositional()
#include "pycore_object.h" // _PyObject_GC_UNTRACK() #include "pycore_object.h" // _PyObject_GC_UNTRACK()
#include "pycore_opcode_metadata.h" // _PyOpcode_Caches #include "pycore_opcode_metadata.h" // _PyOpcode_Caches
#include "pycore_opcode_utils.h" // RESUME_AFTER_YIELD_FROM
#include "pycore_pyerrors.h" // _PyErr_ClearExcState() #include "pycore_pyerrors.h" // _PyErr_ClearExcState()
#include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pystate.h" // _PyThreadState_GET()
@ -363,7 +364,7 @@ _PyGen_yf(PyGenObject *gen)
assert(_PyCode_CODE(_PyGen_GetCode(gen))[0].op.code != SEND); assert(_PyCode_CODE(_PyGen_GetCode(gen))[0].op.code != SEND);
return NULL; return NULL;
} }
if (!is_resume(frame->instr_ptr) || frame->instr_ptr->op.arg < 2) if (!is_resume(frame->instr_ptr) || frame->instr_ptr->op.arg < RESUME_AFTER_YIELD_FROM)
{ {
/* Not in a yield from */ /* Not in a yield from */
return NULL; return NULL;

2
Python/bytecodes.c
View File

@ -147,7 +147,7 @@ dummy_func(
next_instr--; next_instr--;
} }
else { else {
if (oparg < 2) { if (oparg < RESUME_AFTER_YIELD_FROM) {
CHECK_EVAL_BREAKER(); CHECK_EVAL_BREAKER();
} }
next_instr[-1].op.code = RESUME_CHECK; next_instr[-1].op.code = RESUME_CHECK;

2
Python/ceval.c
View File

@ -643,7 +643,7 @@ static const _Py_CODEUNIT _Py_INTERPRETER_TRAMPOLINE_INSTRUCTIONS[] = {
{ .op.code = INTERPRETER_EXIT, .op.arg = 0 }, /* reached on return */ { .op.code = INTERPRETER_EXIT, .op.arg = 0 }, /* reached on return */
{ .op.code = NOP, .op.arg = 0 }, { .op.code = NOP, .op.arg = 0 },
{ .op.code = INTERPRETER_EXIT, .op.arg = 0 }, /* reached on yield */ { .op.code = INTERPRETER_EXIT, .op.arg = 0 }, /* reached on yield */
{ .op.code = RESUME, .op.arg = 0 } { .op.code = RESUME, .op.arg = RESUME_AT_FUNC_START }
}; };
extern const struct _PyCode_DEF(8) _Py_InitCleanup; extern const struct _PyCode_DEF(8) _Py_InitCleanup;

6
Python/compile.c
View File

@ -1383,7 +1383,7 @@ compiler_enter_scope(struct compiler *c, identifier name,
else { else {
RETURN_IF_ERROR(compiler_set_qualname(c)); RETURN_IF_ERROR(compiler_set_qualname(c));
} }
ADDOP_I(c, loc, RESUME, 0); ADDOP_I(c, loc, RESUME, RESUME_AT_FUNC_START);
if (u->u_scope_type == COMPILER_SCOPE_MODULE) { if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
loc.lineno = -1; loc.lineno = -1;
@ -1552,7 +1552,7 @@ compiler_add_yield_from(struct compiler *c, location loc, int await)
ADDOP_JUMP(c, loc, SETUP_FINALLY, fail); ADDOP_JUMP(c, loc, SETUP_FINALLY, fail);
ADDOP_I(c, loc, YIELD_VALUE, 0); ADDOP_I(c, loc, YIELD_VALUE, 0);
ADDOP(c, NO_LOCATION, POP_BLOCK); ADDOP(c, NO_LOCATION, POP_BLOCK);
ADDOP_I(c, loc, RESUME, await ? 3 : 2); ADDOP_I(c, loc, RESUME, await ? RESUME_AFTER_AWAIT : RESUME_AFTER_YIELD_FROM);
ADDOP_JUMP(c, loc, JUMP_NO_INTERRUPT, send); ADDOP_JUMP(c, loc, JUMP_NO_INTERRUPT, send);
USE_LABEL(c, fail); USE_LABEL(c, fail);
@ -4161,7 +4161,7 @@ addop_yield(struct compiler *c, location loc) {
ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_ASYNC_GEN_WRAP); ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_ASYNC_GEN_WRAP);
} }
ADDOP_I(c, loc, YIELD_VALUE, 0); ADDOP_I(c, loc, YIELD_VALUE, 0);
ADDOP_I(c, loc, RESUME, 1); ADDOP_I(c, loc, RESUME, RESUME_AFTER_YIELD);
return SUCCESS; return SUCCESS;
} }

2
Python/generated_cases.c.h generated
View File

@ -23,7 +23,7 @@
next_instr--; next_instr--;
} }
else { else {
if (oparg < 2) { if (oparg < RESUME_AFTER_YIELD_FROM) {
CHECK_EVAL_BREAKER(); CHECK_EVAL_BREAKER();
} }
next_instr[-1].op.code = RESUME_CHECK; next_instr[-1].op.code = RESUME_CHECK;

3
Python/specialize.c
View File

@ -10,6 +10,7 @@
#include "pycore_moduleobject.h" #include "pycore_moduleobject.h"
#include "pycore_object.h" #include "pycore_object.h"
#include "pycore_opcode_metadata.h" // _PyOpcode_Caches #include "pycore_opcode_metadata.h" // _PyOpcode_Caches
#include "pycore_opcode_utils.h" // RESUME_AT_FUNC_START
#include "pycore_pylifecycle.h" // _PyOS_URandomNonblock() #include "pycore_pylifecycle.h" // _PyOS_URandomNonblock()
#include "pycore_runtime.h" // _Py_ID() #include "pycore_runtime.h" // _Py_ID()
@ -2541,6 +2542,6 @@ const struct _PyCode_DEF(8) _Py_InitCleanup = {
.co_code_adaptive = { .co_code_adaptive = {
EXIT_INIT_CHECK, 0, EXIT_INIT_CHECK, 0,
RETURN_VALUE, 0, RETURN_VALUE, 0,
RESUME, 0, RESUME, RESUME_AT_FUNC_START,
} }
}; };