Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

bpo-36974: rename _FastCallKeywords -> _Vectorcall#13653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
encukou merged 1 commit intopython:masterfromjdemeyer:pep590_fastcallkeywords
May 30, 2019
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionInclude/descrobject.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 *);
Expand Down
2 changes: 1 addition & 1 deletionInclude/funcobject.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down
2 changes: 1 addition & 1 deletionInclude/methodobject.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
10 changes: 5 additions & 5 deletionsObjects/call.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand DownExpand Up@@ -714,9 +714,9 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self,


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;

Expand Down
8 changes: 4 additions & 4 deletionsObjects/descrobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand DownExpand Up@@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletionObjects/funcobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletionObjects/methodobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down
8 changes: 4 additions & 4 deletionsPython/ceval.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) {
Expand All@@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletionTools/gdb/libpython.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1564,7 +1564,7 @@ def is_other_python_frame(self):
return False

if caller in ('_PyCFunction_FastCallDict',
'_PyCFunction_FastCallKeywords',
'_PyCFunction_Vectorcall',
'cfunction_call_varargs'):
arg_name = 'func'
# Within that frame:
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp