From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 2 Apr 2020 00:55:43 +0000 (+0900)
Subject: bpo-37207: Use PEP 590 vectorcall to speed up dict() (GH-19280)
X-Git-Tag: v3.9.0a6~213
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e27916b1fc0364e3627438df48550c16f0b80b82;p=thirdparty%2FPython%2Fcpython.git

bpo-37207: Use PEP 590 vectorcall to speed up dict() (GH-19280)
---

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
index 000000000000..cb5e9ff5b8f8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-04-02-00-25-19.bpo-37207.ZTPmKJ.rst	
@@ -0,0 +1,2 @@
+Speed up calls to ``dict()`` by using the :pep:`590` ``vectorcall`` calling
+convention.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 2ca32b5a9d2a..e5f7005d49f2 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -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 *