mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

bpo-47009: Let PRECALL_NO_KW_LIST_APPEND do its own POP_TOP (GH-32239)

Browse source
This commit is contained in:
Dennis Sweeney 2022-04-05 06:18:30 -04:00 • committed by GitHub
parent 96e09837fb
commit 6c6e0408a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/ceval.c
View file

@ -5040,15 +5040,15 @@ handle_eval_breaker:
PyObject *list = SECOND(); PyObject *list = SECOND();
DEOPT_IF(!PyList_Check(list), PRECALL); DEOPT_IF(!PyList_Check(list), PRECALL);
STAT_INC(PRECALL, hit); 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(); PyObject *arg = POP();
if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) { if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) {
goto error; goto error;
} }
STACK_SHRINK(2);
Py_DECREF(list); Py_DECREF(list);
STACK_SHRINK(1);
Py_INCREF(Py_None);
SET_TOP(Py_None);
Py_DECREF(callable); Py_DECREF(callable);
NOTRACE_DISPATCH(); NOTRACE_DISPATCH();
} }

5
Python/specialize.c
View file

@ -1435,7 +1435,10 @@ specialize_method_descriptor(PyMethodDescrObject *descr, _Py_CODEUNIT *instr,
} }
PyInterpreterState *interp = _PyInterpreterState_GET(); PyInterpreterState *interp = _PyInterpreterState_GET();
PyObject *list_append = interp->callable_cache.list_append; 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); _Py_SET_OPCODE(*instr, PRECALL_NO_KW_LIST_APPEND);
return 0; return 0;
} }