[Python-checkins] cpython: Backed out changeset 0e4f26083bbb (PyObject_CallMethodObjArgs)
victor.stinner
python-checkins at python.org
Tue Aug 23 19:00:54 EDT 2016
https://hg.python.org/cpython/rev/46f7a27bf436
changeset: 102876:46f7a27bf436
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Aug 24 00:59:40 2016 +0200
summary:
Backed out changeset 0e4f26083bbb (PyObject_CallMethodObjArgs)
files:
Objects/abstract.c | 113 ++++++++++----------------------
1 files changed, 37 insertions(+), 76 deletions(-)
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2499,52 +2499,32 @@
return retval;
}
-static PyObject **
-objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size,
- va_list va, Py_ssize_t *p_nargs)
+static PyObject *
+objargs_mktuple(va_list va)
{
- Py_ssize_t i, n;
+ int i, n = 0;
va_list countva;
- PyObject **stack;
-
- /* Count the number of arguments */
- Py_VA_COPY(countva, va);
-
- n = 0;
- while (1) {
- PyObject *arg = (PyObject *)va_arg(countva, PyObject *);
- if (arg == NULL) {
- break;
- }
- n++;
- }
- *p_nargs = n;
-
- /* Copy arguments */
- if (small_stack_size <= n) {
- stack = small_stack;
- }
- else {
- stack = PyMem_Malloc(n * sizeof(PyObject**));
- if (stack == NULL) {
- PyErr_NoMemory();
- return NULL;
+ PyObject *result, *tmp;
+
+ Py_VA_COPY(countva, va);
+
+ while (((PyObject *)va_arg(countva, PyObject *)) != NULL)
+ ++n;
+ result = PyTuple_New(n);
+ if (result != NULL && n > 0) {
+ for (i = 0; i < n; ++i) {
+ tmp = (PyObject *)va_arg(va, PyObject *);
+ PyTuple_SET_ITEM(result, i, tmp);
+ Py_INCREF(tmp);
}
}
-
- for (i = 0; i < n; ++i) {
- stack[i] = va_arg(va, PyObject *);
- }
- return stack;
+ return result;
}
PyObject *
PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
{
- PyObject *small_stack[5];
- PyObject **stack;
- Py_ssize_t nargs;
- PyObject *result;
+ PyObject *args, *tmp;
va_list vargs;
if (callable == NULL || name == NULL) {
@@ -2557,31 +2537,24 @@
/* count the args */
va_start(vargs, name);
- stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack),
- vargs, &nargs);
+ args = objargs_mktuple(vargs);
va_end(vargs);
- if (stack == NULL) {
+ if (args == NULL) {
Py_DECREF(callable);
return NULL;
}
-
- result = _PyObject_FastCall(callable, stack, nargs);
+ tmp = PyObject_Call(callable, args, NULL);
+ Py_DECREF(args);
Py_DECREF(callable);
- if (stack != small_stack) {
- PyMem_Free(stack);
- }
-
- return result;
+
+ return tmp;
}
PyObject *
_PyObject_CallMethodIdObjArgs(PyObject *callable,
struct _Py_Identifier *name, ...)
{
- PyObject *small_stack[5];
- PyObject **stack;
- Py_ssize_t nargs;
- PyObject *result;
+ PyObject *args, *tmp;
va_list vargs;
if (callable == NULL || name == NULL) {
@@ -2594,30 +2567,23 @@
/* count the args */
va_start(vargs, name);
- stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack),
- vargs, &nargs);
+ args = objargs_mktuple(vargs);
va_end(vargs);
- if (stack == NULL) {
+ if (args == NULL) {
Py_DECREF(callable);
return NULL;
}
-
- result = _PyObject_FastCall(callable, stack, nargs);
+ tmp = PyObject_Call(callable, args, NULL);
+ Py_DECREF(args);
Py_DECREF(callable);
- if (stack != small_stack) {
- PyMem_Free(stack);
- }
-
- return result;
+
+ return tmp;
}
PyObject *
PyObject_CallFunctionObjArgs(PyObject *callable, ...)
{
- PyObject *small_stack[5];
- PyObject **stack;
- Py_ssize_t nargs;
- PyObject *result;
+ PyObject *args, *tmp;
va_list vargs;
if (callable == NULL) {
@@ -2626,19 +2592,14 @@
/* count the args */
va_start(vargs, callable);
- stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack),
- vargs, &nargs);
+ args = objargs_mktuple(vargs);
va_end(vargs);
- if (stack == NULL) {
+ if (args == NULL)
return NULL;
- }
-
- result = _PyObject_FastCall(callable, stack, nargs);
- if (stack != small_stack) {
- PyMem_Free(stack);
- }
-
- return result;
+ tmp = PyObject_Call(callable, args, NULL);
+ Py_DECREF(args);
+
+ return tmp;
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list