bpo-36974: rename _FastCallKeywords -> _Vectorcall (GH-13653)

diff --git a/Include/descrobject.h b/Include/descrobject.h
index 3db09635399cc24c9cf201d087981334a1a42757..d7114852c1e210d5713f41dc3e34d2f5684dd724 100644 (file)
--- a/Include/descrobject.h
+++ b/Include/descrobject.h
@@ -92,7 +92,7 @@ PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
                                                struct PyGetSetDef *);
 #ifndef Py_LIMITED_API
 
-PyAPI_FUNC(PyObject *) _PyMethodDescr_FastCallKeywords(
+PyAPI_FUNC(PyObject *) _PyMethodDescr_Vectorcall(
         PyObject *descrobj, PyObject *const *args, size_t nargsf, PyObject *kwnames);
 PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
                                                 struct wrapperbase *, void *);

diff --git a/Include/funcobject.h b/Include/funcobject.h
index 7ba000e1f13cc2b4497d6378b2984c2f9fedd9ff..e563a74a15b6e182a99bdc7bb276b4a660c9f6c6 100644 (file)
--- a/Include/funcobject.h
+++ b/Include/funcobject.h
@@ -66,7 +66,7 @@ PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict(
     Py_ssize_t nargs,
     PyObject *kwargs);
 
-PyAPI_FUNC(PyObject *) _PyFunction_FastCallKeywords(
+PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall(
     PyObject *func,
     PyObject *const *stack,
     size_t nargsf,

diff --git a/Include/methodobject.h b/Include/methodobject.h
index 5dbe2145dadc3987b6c4eadb172404fa97499dd3..e92adde7bf6bd7f4fa4edff51e0d10c48d611484 100644 (file)
--- a/Include/methodobject.h
+++ b/Include/methodobject.h
@@ -47,7 +47,7 @@ PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
     Py_ssize_t nargs,
     PyObject *kwargs);
 
-PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func,
+PyAPI_FUNC(PyObject *) _PyCFunction_Vectorcall(PyObject *func,
     PyObject *const *stack,
     size_t nargsf,
     PyObject *kwnames);

diff --git a/Objects/call.c b/Objects/call.c
index 55dfc520f1deb1bd6732083ae4042c3af1e73e26..acd1f26dcbb576fcdb6c1e874bc12fb17d8c3f56 100644 (file)
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -374,8 +374,8 @@ _PyFunction_FastCallDict(PyObject *func, PyObject *const *args, Py_ssize_t nargs
 
 
 PyObject *
-_PyFunction_FastCallKeywords(PyObject *func, PyObject* const* stack,
-                             size_t nargsf, PyObject *kwnames)
+_PyFunction_Vectorcall(PyObject *func, PyObject* const* stack,
+                       size_t nargsf, PyObject *kwnames)
 {
     PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);
     PyObject *globals = PyFunction_GET_GLOBALS(func);
@@ -714,9 +714,9 @@ exit:
 
 
 PyObject *
-_PyCFunction_FastCallKeywords(PyObject *func,
-                              PyObject *const *args, size_t nargsf,
-                              PyObject *kwnames)
+_PyCFunction_Vectorcall(PyObject *func,
+                        PyObject *const *args, size_t nargsf,
+                        PyObject *kwnames)
 {
     PyObject *result;
 

diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 759018503c65e00bba3ea687e36335fcb295859c..3aaeaa6e890fdf48a010111bceca396959006df3 100644 (file)
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -264,9 +264,9 @@ methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwargs)
 
 // same to methoddescr_call(), but use FASTCALL convention.
 PyObject *
-_PyMethodDescr_FastCallKeywords(PyObject *descrobj,
-                                PyObject *const *args, size_t nargsf,
-                                PyObject *kwnames)
+_PyMethodDescr_Vectorcall(PyObject *descrobj,
+                          PyObject *const *args, size_t nargsf,
+                          PyObject *kwnames)
 {
     assert(Py_TYPE(descrobj) == &PyMethodDescr_Type);
     PyMethodDescrObject *descr = (PyMethodDescrObject *)descrobj;
@@ -756,7 +756,7 @@ PyDescr_NewMethod(PyTypeObject *type, PyMethodDef *method)
                                              type, method->ml_name);
     if (descr != NULL) {
         descr->d_method = method;
-        descr->vectorcall = &_PyMethodDescr_FastCallKeywords;
+        descr->vectorcall = _PyMethodDescr_Vectorcall;
     }
     return (PyObject *)descr;
 }

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 2b1f42db746dbcd3a006829e3e946a65a6397d23..6f5b5d223d9be0c52cf16eb2398c10f3fc19b5dd 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -36,7 +36,7 @@ PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname
     op->func_defaults = NULL; /* No default arguments */
     op->func_kwdefaults = NULL; /* No keyword only defaults */
     op->func_closure = NULL;
-    op->vectorcall = _PyFunction_FastCallKeywords;
+    op->vectorcall = _PyFunction_Vectorcall;
 
     consts = ((PyCodeObject *)code)->co_consts;
     if (PyTuple_Size(consts) >= 1) {

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 76497c93894a897567076e04fc784530a816a907..544baee09113ab29f9f5e7f5af44411e623854cf 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -52,7 +52,7 @@ PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module)
         op->vectorcall = NULL;
     }
     else {
-        op->vectorcall = &_PyCFunction_FastCallKeywords;
+        op->vectorcall = _PyCFunction_Vectorcall;
     }
     _PyObject_GC_TRACK(op);
     return (PyObject *)op;

diff --git a/Python/ceval.c b/Python/ceval.c
index 47baa4d03ed9cc480cfeba58f97b424fe06cac69..71e6eb8ebcfd3efd83b650e61af1c2116d296703 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4815,7 +4815,7 @@ trace_call_function(PyThreadState *tstate,
 {
     PyObject *x;
     if (PyCFunction_Check(func)) {
-        C_TRACE(x, _PyCFunction_FastCallKeywords(func, args, nargs, kwnames));
+        C_TRACE(x, _PyCFunction_Vectorcall(func, args, nargs, kwnames));
         return x;
     }
     else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) {
@@ -4831,9 +4831,9 @@ trace_call_function(PyThreadState *tstate,
         if (func == NULL) {
             return NULL;
         }
-        C_TRACE(x, _PyCFunction_FastCallKeywords(func,
-                                                 args+1, nargs-1,
-                                                 kwnames));
+        C_TRACE(x, _PyCFunction_Vectorcall(func,
+                                           args+1, nargs-1,
+                                           kwnames));
         Py_DECREF(func);
         return x;
     }

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index d49546fa9c46dbb207312fd10c2109e7cabfde63..93f720ab7e2a100638f5126e21f78f4099d0b59d 100755 (executable)
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1564,7 +1564,7 @@ class Frame(object):
             return False
 
         if caller in ('_PyCFunction_FastCallDict',
-                      '_PyCFunction_FastCallKeywords',
+                      '_PyCFunction_Vectorcall',
                       'cfunction_call_varargs'):
             arg_name = 'func'
             # Within that frame: