]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-37207: Use PEP 590 vectorcall to speed up dict() (GH-19280)
authorDong-hee Na <donghee.na92@gmail.com>
Thu, 2 Apr 2020 00:55:43 +0000 (09:55 +0900)
committerGitHub <noreply@github.com>
Thu, 2 Apr 2020 00:55:43 +0000 (02:55 +0200)
Misc/NEWS.d/next/Core and Builtins/2020-04-02-00-25-19.bpo-37207.ZTPmKJ.rst [new file with mode: 0644]
Objects/dictobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-02-00-25-19.bpo-37207.ZTPmKJ.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-02-00-25-19.bpo-37207.ZTPmKJ.rst
new file mode 100644 (file)
index 0000000..cb5e9ff
--- /dev/null
@@ -0,0 +1,2 @@
+Speed up calls to ``dict()`` by using the :pep:`590` ``vectorcall`` calling
+convention.
index 2ca32b5a9d2a3a375c98f0e13c8ec8a030a0bc90..e5f7005d49f23a48132dbb7631827a6c76d44004 100644 (file)
@@ -3342,6 +3342,38 @@ dict_init(PyObject *self, PyObject *args, PyObject *kwds)
     return dict_update_common(self, args, kwds, "dict");
 }
 
+static PyObject *
+dict_vectorcall(PyObject *type, PyObject * const*args,
+                size_t nargsf, PyObject *kwnames)
+{
+    assert(PyType_Check(type));
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (!_PyArg_CheckPositional("dict", nargs, 0, 1)) {
+        return NULL;
+    }
+
+    PyObject *self = dict_new((PyTypeObject *)type, NULL, NULL);
+    if (self == NULL) {
+        return NULL;
+    }
+    if (nargs == 1) {
+        if (dict_update_arg(self, args[0]) < 0) {
+            Py_DECREF(self);
+            return NULL;
+        }
+        args++;
+    }
+    if (kwnames != NULL) {
+        for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwnames); i++) {
+            if (PyDict_SetItem(self, PyTuple_GET_ITEM(kwnames, i), args[i]) < 0) {
+                Py_DECREF(self);
+                return NULL;
+            }
+        }
+    }
+    return self;
+}
+
 static PyObject *
 dict_iter(PyDictObject *dict)
 {
@@ -3400,6 +3432,7 @@ PyTypeObject PyDict_Type = {
     PyType_GenericAlloc,                        /* tp_alloc */
     dict_new,                                   /* tp_new */
     PyObject_GC_Del,                            /* tp_free */
+    .tp_vectorcall = dict_vectorcall,
 };
 
 PyObject *