Commit ddaf35b0 authored by Stefan Behnel's avatar Stefan Behnel

used copied CPython PyCFunction_Call() function also for fused functions in PyPy

parent a286151e
...@@ -533,6 +533,8 @@ static CYTHON_INLINE void __Pyx_CyFunction_InitClassCell(PyObject *cyfunctions, ...@@ -533,6 +533,8 @@ static CYTHON_INLINE void __Pyx_CyFunction_InitClassCell(PyObject *cyfunctions,
PyObject *classobj); PyObject *classobj);
//////////////////// CyFunctionClassCell //////////////////// //////////////////// CyFunctionClassCell ////////////////////
//@requires: CythonFunction
void __Pyx_CyFunction_InitClassCell(PyObject *cyfunctions, void __Pyx_CyFunction_InitClassCell(PyObject *cyfunctions,
PyObject *classobj) PyObject *classobj)
{ {
...@@ -567,6 +569,8 @@ static int __pyx_FusedFunction_init(void); ...@@ -567,6 +569,8 @@ static int __pyx_FusedFunction_init(void);
#define __Pyx_FusedFunction_USED #define __Pyx_FusedFunction_USED
//////////////////// FusedFunction //////////////////// //////////////////// FusedFunction ////////////////////
//@requires: CythonFunction
static PyObject * static PyObject *
__pyx_FusedFunction_New(PyTypeObject *type, PyMethodDef *ml, int flags, PyObject *self, __pyx_FusedFunction_New(PyTypeObject *type, PyMethodDef *ml, int flags, PyObject *self,
PyObject *module, PyObject *code) PyObject *module, PyObject *code)
...@@ -765,12 +769,12 @@ __pyx_FusedFunction_callfunction(PyObject *func, PyObject *args, PyObject *kw) ...@@ -765,12 +769,12 @@ __pyx_FusedFunction_callfunction(PyObject *func, PyObject *args, PyObject *kw)
m_self = cyfunc->func.m_self; m_self = cyfunc->func.m_self;
cyfunc->func.m_self = self; cyfunc->func.m_self = self;
result = __Pyx_PyCFunction_Call(func, new_args, kw); result = __Pyx_CyFunction_Call(func, new_args, kw);
cyfunc->func.m_self = m_self; cyfunc->func.m_self = m_self;
Py_DECREF(new_args); Py_DECREF(new_args);
} else { } else {
result = __Pyx_PyCFunction_Call(func, args, kw); result = __Pyx_CyFunction_Call(func, args, kw);
} }
return result; return result;
......
...@@ -40,12 +40,6 @@ ...@@ -40,12 +40,6 @@
#define CYTHON_COMPILING_IN_CPYTHON 1 #define CYTHON_COMPILING_IN_CPYTHON 1
#endif #endif
#if CYTHON_COMPILING_IN_PYPY
#define __Pyx_PyCFunction_Call PyObject_Call
#else
#define __Pyx_PyCFunction_Call PyCFunction_Call
#endif
#if PY_VERSION_HEX < 0x02050000 #if PY_VERSION_HEX < 0x02050000
typedef int Py_ssize_t; typedef int Py_ssize_t;
#define PY_SSIZE_T_MAX INT_MAX #define PY_SSIZE_T_MAX INT_MAX
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment