Avoid inefficient way to call functions without argument

vstinner · vstinner · commit ad8c83ad6b91 · 2016-09-05T17:53:15.000-07:00
Don't pass "()" format to PyObject_CallXXX() to call a function without
argument: pass NULL as the format string instead. It avoids to have to parse a
string to produce 0 argument.
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -2009,7 +2009,7 @@ defdict_reduce(defdictobject *dd)
         args = PyTuple_Pack(1, dd->default_factory);
     if (args == NULL)
         return NULL;
-    items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, "()");
+    items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, NULL);
     if (items == NULL) {
         Py_DECREF(args);
         return NULL;
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -1378,7 +1378,7 @@ time_time(void)
     if (time != NULL) {
         _Py_IDENTIFIER(time);
 
-        result = _PyObject_CallMethodId(time, &PyId_time, "()");
+        result = _PyObject_CallMethodId(time, &PyId_time, NULL);
         Py_DECREF(time);
     }
     return result;
@@ -2703,7 +2703,7 @@ date_isoformat(PyDateTime_Date *self)
 static PyObject *
 date_str(PyDateTime_Date *self)
 {
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()");
+    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);
 }
 
 
@@ -2729,7 +2729,7 @@ date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw)
                                       &format))
         return NULL;
 
-    tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, "()");
+    tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, NULL);
     if (tuple == NULL)
         return NULL;
     result = wrap_strftime((PyObject *)self, format, tuple,
@@ -3675,7 +3675,7 @@ time_repr(PyDateTime_Time *self)
 static PyObject *
 time_str(PyDateTime_Time *self)
 {
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()");
+    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);
 }
 
 static PyObject *
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -2873,7 +2873,7 @@ save_dict(PicklerObject *self, PyObject *obj)
         } else {
             _Py_IDENTIFIER(items);
 
-            items = _PyObject_CallMethodId(obj, &PyId_items, "()");
+            items = _PyObject_CallMethodId(obj, &PyId_items, NULL);
             if (items == NULL)
                 goto error;
             iter = PyObject_GetIter(items);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -5758,7 +5758,7 @@ static PyObject * \
 FUNCNAME(PyObject *self) \
 { \
     _Py_static_string(id, OPSTR); \
-    return call_method(self, &id, "()"); \
+    return call_method(self, &id, NULL); \
 }
 
 #define SLOT1(FUNCNAME, OPSTR, ARG1TYPE, ARGCODES) \
@@ -5851,7 +5851,7 @@ FUNCNAME(PyObject *self, ARG1TYPE arg1, ARG2TYPE arg2) \
 static Py_ssize_t
 slot_sq_length(PyObject *self)
 {
-    PyObject *res = call_method(self, &PyId___len__, "()");
+    PyObject *res = call_method(self, &PyId___len__, NULL);
     Py_ssize_t len;
 
     if (res == NULL)
@@ -6065,7 +6065,7 @@ static PyObject *
 slot_nb_index(PyObject *self)
 {
     _Py_IDENTIFIER(__index__);
-    return call_method(self, &PyId___index__, "()");
+    return call_method(self, &PyId___index__, NULL);
 }
 
 
@@ -6351,7 +6351,7 @@ static PyObject *
 slot_tp_iternext(PyObject *self)
 {
     _Py_IDENTIFIER(__next__);
-    return call_method(self, &PyId___next__, "()");
+    return call_method(self, &PyId___next__, NULL);
 }
 
 static PyObject *
diff --git a/Python/modsupport.c b/Python/modsupport.c
@@ -468,7 +468,7 @@ va_build_value(const char *format, va_list va, int flags)
     int n = countformat(f, '\0');
     va_list lva;
 
-        Py_VA_COPY(lva, va);
+    Py_VA_COPY(lva, va);
 
     if (n < 0)
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -1378,7 +1378,7 @@ time_time(void)`
`1378`	`1378`	`if (time != NULL) {`
`1379`	`1379`	`_Py_IDENTIFIER(time);`
`1380`	`1380`
`1381`		`- result = _PyObject_CallMethodId(time, &PyId_time, "()");`
	`1381`	`+ result = _PyObject_CallMethodId(time, &PyId_time, NULL);`
`1382`	`1382`	`Py_DECREF(time);`
`1383`	`1383`	`}`
`1384`	`1384`	`return result;`
`@@ -2703,7 +2703,7 @@ date_isoformat(PyDateTime_Date *self)`
`2703`	`2703`	`static PyObject *`
`2704`	`2704`	`date_str(PyDateTime_Date *self)`
`2705`	`2705`	`{`
`2706`		`- return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()");`
	`2706`	`+ return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);`
`2707`	`2707`	`}`
`2708`	`2708`
`2709`	`2709`
`@@ -2729,7 +2729,7 @@ date_strftime(PyDateTime_Date self, PyObject args, PyObject *kw)`
`2729`	`2729`	`&format))`
`2730`	`2730`	`return NULL;`
`2731`	`2731`
`2732`		`- tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, "()");`
	`2732`	`+ tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, NULL);`
`2733`	`2733`	`if (tuple == NULL)`
`2734`	`2734`	`return NULL;`
`2735`	`2735`	`result = wrap_strftime((PyObject *)self, format, tuple,`
`@@ -3675,7 +3675,7 @@ time_repr(PyDateTime_Time *self)`
`3675`	`3675`	`static PyObject *`
`3676`	`3676`	`time_str(PyDateTime_Time *self)`
`3677`	`3677`	`{`
`3678`		`- return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()");`
	`3678`	`+ return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);`
`3679`	`3679`	`}`
`3680`	`3680`
`3681`	`3681`	`static PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -5758,7 +5758,7 @@ static PyObject * \`
`5758`	`5758`	`FUNCNAME(PyObject *self) \`
`5759`	`5759`	`{ \`
`5760`	`5760`	`_Py_static_string(id, OPSTR); \`
`5761`		`- return call_method(self, &id, "()"); \`
	`5761`	`+ return call_method(self, &id, NULL); \`
`5762`	`5762`	`}`
`5763`	`5763`
`5764`	`5764`	`#define SLOT1(FUNCNAME, OPSTR, ARG1TYPE, ARGCODES) \`
`@@ -5851,7 +5851,7 @@ FUNCNAME(PyObject *self, ARG1TYPE arg1, ARG2TYPE arg2) \`
`5851`	`5851`	`static Py_ssize_t`
`5852`	`5852`	`slot_sq_length(PyObject *self)`
`5853`	`5853`	`{`
`5854`		`- PyObject *res = call_method(self, &PyId___len__, "()");`
	`5854`	`+ PyObject *res = call_method(self, &PyId___len__, NULL);`
`5855`	`5855`	`Py_ssize_t len;`
`5856`	`5856`
`5857`	`5857`	`if (res == NULL)`
`@@ -6065,7 +6065,7 @@ static PyObject *`
`6065`	`6065`	`slot_nb_index(PyObject *self)`
`6066`	`6066`	`{`
`6067`	`6067`	`_Py_IDENTIFIER(__index__);`
`6068`		`- return call_method(self, &PyId___index__, "()");`
	`6068`	`+ return call_method(self, &PyId___index__, NULL);`
`6069`	`6069`	`}`
`6070`	`6070`
`6071`	`6071`
`@@ -6351,7 +6351,7 @@ static PyObject *`
`6351`	`6351`	`slot_tp_iternext(PyObject *self)`
`6352`	`6352`	`{`
`6353`	`6353`	`_Py_IDENTIFIER(__next__);`
`6354`		`- return call_method(self, &PyId___next__, "()");`
	`6354`	`+ return call_method(self, &PyId___next__, NULL);`
`6355`	`6355`	`}`
`6356`	`6356`
`6357`	`6357`	`static PyObject *`