diff options
| author | Mark Shannon <mark@hotpy.org> | 2022-05-04 15:31:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 15:31:21 (GMT) |
| commit | f8a2fab212c4e9ea92a5b667560449904c4cf7af (patch) | |
| tree | dc6c40594f776bd7d262a1b915661c253acc92d3 /Python | |
| parent | 9d20e1af409c22537f096206edd330f16ab8f1f3 (diff) | |
| download | cpython-f8a2fab212c4e9ea92a5b667560449904c4cf7af.zip cpython-f8a2fab212c4e9ea92a5b667560449904c4cf7af.tar.gz cpython-f8a2fab212c4e9ea92a5b667560449904c4cf7af.tar.bz2 | |
GH-92239: Make sure that PEP 523 is supported, even when specializing first. (GH-92245)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 2 | ||||
| -rw-r--r-- | Python/specialize.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 6f46c7f..b2735a1 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4890,6 +4890,7 @@ handle_eval_breaker: TARGET(CALL_PY_EXACT_ARGS) { assert(call_shape.kwnames == NULL); + DEOPT_IF(tstate->interp->eval_frame, CALL); _PyCallCache *cache = (_PyCallCache *)next_instr; int is_meth = is_method(stack_pointer, oparg); int argcount = oparg + is_meth; @@ -4923,6 +4924,7 @@ handle_eval_breaker: TARGET(CALL_PY_WITH_DEFAULTS) { assert(call_shape.kwnames == NULL); + DEOPT_IF(tstate->interp->eval_frame, CALL); _PyCallCache *cache = (_PyCallCache *)next_instr; int is_meth = is_method(stack_pointer, oparg); int argcount = oparg + is_meth; diff --git a/Python/specialize.c b/Python/specialize.c index 12871ce..fa42993 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -440,6 +440,7 @@ initial_counter_value(void) { #define SPEC_FAIL_CALL_METHOD_WRAPPER 26 #define SPEC_FAIL_CALL_OPERATOR_WRAPPER 27 #define SPEC_FAIL_CALL_PYFUNCTION 28 +#define SPEC_FAIL_CALL_PEP_523 29 /* COMPARE_OP */ #define SPEC_FAIL_COMPARE_OP_DIFFERENT_TYPES 12 @@ -1471,6 +1472,11 @@ specialize_py_call(PyFunctionObject *func, _Py_CODEUNIT *instr, int nargs, assert(_Py_OPCODE(*instr) == CALL_ADAPTIVE); PyCodeObject *code = (PyCodeObject *)func->func_code; int kind = function_kind(code); + /* Don't specialize if PEP 523 is active */ + if (_PyInterpreterState_GET()->eval_frame) { + SPECIALIZATION_FAIL(CALL, SPEC_FAIL_CALL_PEP_523); + return -1; + } if (kwnames) { SPECIALIZATION_FAIL(CALL, SPEC_FAIL_CALL_KWNAMES); return -1; |