diff options
| author | Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com> | 2022-04-05 10:18:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 10:18:30 (GMT) |
| commit | 6c6e0408a663c1f53dad403f54a18d444da39cb7 (patch) | |
| tree | c4765221f266993c2f633587c11811dcb9d10fd5 | |
| parent | 96e09837fb8031aebe8d823dd19ef664a34bcfad (diff) | |
| download | cpython-6c6e0408a663c1f53dad403f54a18d444da39cb7.zip cpython-6c6e0408a663c1f53dad403f54a18d444da39cb7.tar.gz cpython-6c6e0408a663c1f53dad403f54a18d444da39cb7.tar.bz2 | |
bpo-47009: Let PRECALL_NO_KW_LIST_APPEND do its own POP_TOP (GH-32239)
| -rw-r--r-- | Python/ceval.c | 8 | ||||
| -rw-r--r-- | Python/specialize.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 68d2920..ce4abd5 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5040,15 +5040,15 @@ handle_eval_breaker: PyObject *list = SECOND(); DEOPT_IF(!PyList_Check(list), PRECALL); STAT_INC(PRECALL, hit); - SKIP_CALL(); + // PRECALL + CALL + POP_TOP + JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL + 1); + assert(next_instr[-1] == POP_TOP); PyObject *arg = POP(); if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) { goto error; } + STACK_SHRINK(2); Py_DECREF(list); - STACK_SHRINK(1); - Py_INCREF(Py_None); - SET_TOP(Py_None); Py_DECREF(callable); NOTRACE_DISPATCH(); } diff --git a/Python/specialize.c b/Python/specialize.c index 08c6904..36b0502 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -1435,7 +1435,10 @@ specialize_method_descriptor(PyMethodDescrObject *descr, _Py_CODEUNIT *instr, } PyInterpreterState *interp = _PyInterpreterState_GET(); PyObject *list_append = interp->callable_cache.list_append; - if ((PyObject *)descr == list_append && oparg == 1) { + _Py_CODEUNIT next = instr[INLINE_CACHE_ENTRIES_PRECALL + 1 + + INLINE_CACHE_ENTRIES_CALL + 1]; + bool pop = (_Py_OPCODE(next) == POP_TOP); + if ((PyObject *)descr == list_append && oparg == 1 && pop) { _Py_SET_OPCODE(*instr, PRECALL_NO_KW_LIST_APPEND); return 0; } |