Issue #27128: _pickle uses fast call

Use _PyObject_FastCall() to avoid the creation of temporary tuple.
This commit is contained in:
Victor Stinner 2016-08-19 18:59:15 +02:00
parent f7a4c488b5
commit 75210697ec
1 changed files with 4 additions and 15 deletions

View File

@ -345,7 +345,6 @@ static PyObject *
_Pickle_FastCall(PyObject *func, PyObject *obj) _Pickle_FastCall(PyObject *func, PyObject *obj)
{ {
PyObject *result; PyObject *result;
PyObject *arg_tuple = PyTuple_New(1);
/* Note: this function used to reuse the argument tuple. This used to give /* Note: this function used to reuse the argument tuple. This used to give
a slight performance boost with older pickle implementations where many a slight performance boost with older pickle implementations where many
@ -358,13 +357,8 @@ _Pickle_FastCall(PyObject *func, PyObject *obj)
significantly reduced the number of function calls we do. Thus, the significantly reduced the number of function calls we do. Thus, the
benefits became marginal at best. */ benefits became marginal at best. */
if (arg_tuple == NULL) { result = _PyObject_FastCall(func, &obj, 1, NULL);
Py_DECREF(obj); Py_DECREF(obj);
return NULL;
}
PyTuple_SET_ITEM(arg_tuple, 0, obj);
result = PyObject_Call(func, arg_tuple, NULL);
Py_CLEAR(arg_tuple);
return result; return result;
} }
@ -1157,9 +1151,7 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n)
return -1; return -1;
if (n == READ_WHOLE_LINE) { if (n == READ_WHOLE_LINE) {
PyObject *empty_tuple = PyTuple_New(0); data = _PyObject_FastCall(self->readline, NULL, 0, NULL);
data = PyObject_Call(self->readline, empty_tuple, NULL);
Py_DECREF(empty_tuple);
} }
else { else {
PyObject *len; PyObject *len;
@ -3956,10 +3948,7 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
/* Check for a __reduce__ method. */ /* Check for a __reduce__ method. */
reduce_func = _PyObject_GetAttrId(obj, &PyId___reduce__); reduce_func = _PyObject_GetAttrId(obj, &PyId___reduce__);
if (reduce_func != NULL) { if (reduce_func != NULL) {
PyObject *empty_tuple = PyTuple_New(0); reduce_value = _PyObject_FastCall(reduce_func, NULL, 0, NULL);
reduce_value = PyObject_Call(reduce_func, empty_tuple,
NULL);
Py_DECREF(empty_tuple);
} }
else { else {
PyErr_Format(st->PicklingError, PyErr_Format(st->PicklingError,