mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Backed out changeset 70f88b097f60 (map_next)

Browse source
This commit is contained in:
Victor Stinner 2016-08-24 00:54:47 +02:00
parent e62b852605
commit f0cba67d0b
1 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Python/bltinmodule.c
View file

@ -1156,43 +1156,27 @@ map_traverse(mapobject *lz, visitproc visit, void *arg)
static PyObject * static PyObject *
map_next(mapobject *lz) map_next(mapobject *lz)
{ {
PyObject *small_stack[5]; PyObject *val;
PyObject **stack; PyObject *argtuple;
Py_ssize_t niters, nargs, i; PyObject *result;
PyObject *result = NULL; Py_ssize_t numargs, i;
niters = PyTuple_GET_SIZE(lz->iters); numargs = PyTuple_GET_SIZE(lz->iters);
if (niters <= (Py_ssize_t)Py_ARRAY_LENGTH(small_stack)) { argtuple = PyTuple_New(numargs);
stack = small_stack; if (argtuple == NULL)
} return NULL;
else {
stack = PyMem_Malloc(niters * sizeof(PyObject*)); for (i=0 ; i<numargs ; i++) {
if (stack == NULL) { PyObject *it = PyTuple_GET_ITEM(lz->iters, i);
PyErr_NoMemory(); val = Py_TYPE(it)->tp_iternext(it);
if (val == NULL) {
Py_DECREF(argtuple);
return NULL; return NULL;
} }
PyTuple_SET_ITEM(argtuple, i, val);
} }
result = PyObject_Call(lz->func, argtuple, NULL);
nargs = 0; Py_DECREF(argtuple);
for (i=0; i < niters; i++) {
PyObject *it = PyTuple_GET_ITEM(lz->iters, i);
PyObject *val = Py_TYPE(it)->tp_iternext(it);
if (val == NULL) {
goto exit;
}
stack[i] = val;
nargs++;
}
result = _PyObject_FastCall(lz->func, stack, nargs);
exit:
for (i=0; i < nargs; i++) {
Py_DECREF(stack[i]);
}
if (stack != small_stack) {
PyMem_Free(stack);
}
return result; return result;
} }