[Python-checkins] bpo-31410: Optimized calling wrapper and classmethod descriptors. (#3481)

Thu Sep 21 07:25:39 EDT 2017

https://github.com/python/cpython/commit/5e02c7826f9797fb3add79b608ef51f7a62b3e5a
commit: 5e02c7826f9797fb3add79b608ef51f7a62b3e5a
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017年09月21日T14:25:36+03:00
summary:
bpo-31410: Optimized calling wrapper and classmethod descriptors. (#3481)
files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst
M Objects/descrobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst
new file mode 100644
index 00000000000..e3a660f14fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-10-20-58-51.bpo-31410.wD_RbH.rst	
@@ -0,0 +1 @@
+Optimized calling wrapper and classmethod descriptors.
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index edead26a7d5..5dc27ef6727 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -296,7 +296,7 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args,
 PyObject *kwds)
 {
 Py_ssize_t argc;
- PyObject *self, *func, *result, **stack;
+ PyObject *self, *result;
 
 /* Make sure that the first argument is acceptable as 'self' */
 assert(PyTuple_Check(args));
@@ -330,20 +330,38 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args,
 return NULL;
 }
 
- func = PyCFunction_NewEx(descr->d_method, self, NULL);
- if (func == NULL)
- return NULL;
- stack = &PyTuple_GET_ITEM(args, 1);
- result = _PyObject_FastCallDict(func, stack, argc - 1, kwds);
- Py_DECREF(func);
+ result = _PyMethodDef_RawFastCallDict(descr->d_method, self,
+ &PyTuple_GET_ITEM(args, 1), argc - 1,
+ kwds);
+ result = _Py_CheckFunctionResult((PyObject *)descr, result, NULL);
 return result;
 }
 
+Py_LOCAL_INLINE(PyObject *)
+wrapperdescr_raw_call(PyWrapperDescrObject *descr, PyObject *self,
+ PyObject *args, PyObject *kwds)
+{
+ wrapperfunc wrapper = descr->d_base->wrapper;
+
+ if (descr->d_base->flags & PyWrapperFlag_KEYWORDS) {
+ wrapperfunc_kwds wk = (wrapperfunc_kwds)wrapper;
+ return (*wk)(self, args, descr->d_wrapped, kwds);
+ }
+
+ if (kwds != NULL && (!PyDict_Check(kwds) || PyDict_GET_SIZE(kwds) != 0)) {
+ PyErr_Format(PyExc_TypeError,
+ "wrapper %s() takes no keyword arguments",
+ descr->d_base->name);
+ return NULL;
+ }
+ return (*wrapper)(self, args, descr->d_wrapped);
+}
+
 static PyObject *
 wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds)
 {
 Py_ssize_t argc;
- PyObject *self, *func, *result, **stack;
+ PyObject *self, *result;
 
 /* Make sure that the first argument is acceptable as 'self' */
 assert(PyTuple_Check(args));
@@ -369,16 +387,16 @@ wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds)
 return NULL;
 }
 
- func = PyWrapper_New((PyObject *)descr, self);
- if (func == NULL)
+ args = PyTuple_GetSlice(args, 1, argc);
+ if (args == NULL) {
 return NULL;
-
- stack = &PyTuple_GET_ITEM(args, 1);
- result = _PyObject_FastCallDict(func, stack, argc - 1, kwds);
- Py_DECREF(func);
+ }
+ result = wrapperdescr_raw_call(descr, self, args, kwds);
+ Py_DECREF(args);
 return result;
 }
 
+
 static PyObject *
 method_get_doc(PyMethodDescrObject *descr, void *closure)
 {
@@ -1167,21 +1185,7 @@ static PyGetSetDef wrapper_getsets[] = {
 static PyObject *
 wrapper_call(wrapperobject *wp, PyObject *args, PyObject *kwds)
 {
- wrapperfunc wrapper = wp->descr->d_base->wrapper;
- PyObject *self = wp->self;
-
- if (wp->descr->d_base->flags & PyWrapperFlag_KEYWORDS) {
- wrapperfunc_kwds wk = (wrapperfunc_kwds)wrapper;
- return (*wk)(self, args, wp->descr->d_wrapped, kwds);
- }
-
- if (kwds != NULL && (!PyDict_Check(kwds) || PyDict_GET_SIZE(kwds) != 0)) {
- PyErr_Format(PyExc_TypeError,
- "wrapper %s() takes no keyword arguments",
- wp->descr->d_base->name);
- return NULL;
- }
- return (*wrapper)(self, args, wp->descr->d_wrapped);
+ return wrapperdescr_raw_call(wp->descr, wp->self, args, kwds);
 }
 
 static int
