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
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit a3438ac

Browse files
author
Anselm Kruis
committed
Merge branch main into main-slp
The outcome of this merge does not compile.
2 parents 49ebdd7 + 37788bc commit a3438ac

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

‎Include/descrobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
9898
struct PyGetSetDef *);
9999
#ifndef Py_LIMITED_API
100100

101-
PyAPI_FUNC(PyObject *) _PyMethodDescr_FastCallKeywords(
101+
PyAPI_FUNC(PyObject *) _PyMethodDescr_Vectorcall(
102102
PyObject *descrobj, PyObject *const *args, size_t nargsf, PyObject *kwnames);
103103
PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
104104
struct wrapperbase *, void *);

‎Include/funcobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict(
6666
Py_ssize_t nargs,
6767
PyObject *kwargs);
6868

69-
PyAPI_FUNC(PyObject *) _PyFunction_FastCallKeywords(
69+
PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall(
7070
PyObject *func,
7171
PyObject *const *stack,
7272
size_t nargsf,

‎Include/methodobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
4747
Py_ssize_t nargs,
4848
PyObject *kwargs);
4949

50-
PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func,
50+
PyAPI_FUNC(PyObject *) _PyCFunction_Vectorcall(PyObject *func,
5151
PyObject *const *stack,
5252
size_t nargsf,
5353
PyObject *kwnames);

‎Objects/call.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ _PyFunction_FastCallDict(PyObject *func, PyObject *const *args, Py_ssize_t nargs
428428

429429

430430
PyObject *
431-
_PyFunction_FastCallKeywords(PyObject *func, PyObject* const* stack,
432-
size_t nargsf, PyObject *kwnames)
431+
_PyFunction_Vectorcall(PyObject *func, PyObject* const* stack,
432+
size_t nargsf, PyObject *kwnames)
433433
{
434434
STACKLESS_VECTORCALL_GETARG(_PyFunction_FastCallKeywords);
435435
PyObject *result;
@@ -806,9 +806,9 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self,
806806

807807

808808
PyObject *
809-
_PyCFunction_FastCallKeywords(PyObject *func,
810-
PyObject *const *args, size_t nargsf,
811-
PyObject *kwnames)
809+
_PyCFunction_Vectorcall(PyObject *func,
810+
PyObject *const *args, size_t nargsf,
811+
PyObject *kwnames)
812812
{
813813
STACKLESS_VECTORCALL_GETARG(_PyCFunction_FastCallKeywords);
814814
PyObject *result;

‎Objects/descrobject.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwargs)
268268

269269
// same to methoddescr_call(), but use FASTCALL convention.
270270
PyObject *
271-
_PyMethodDescr_FastCallKeywords(PyObject *descrobj,
272-
PyObject *const *args, size_t nargsf,
273-
PyObject *kwnames)
271+
_PyMethodDescr_Vectorcall(PyObject *descrobj,
272+
PyObject *const *args, size_t nargsf,
273+
PyObject *kwnames)
274274
{
275275
STACKLESS_VECTORCALL_GETARG(_PyMethodDescr_FastCallKeywords);
276276
assert(Py_TYPE(descrobj) == &PyMethodDescr_Type);
@@ -789,7 +789,7 @@ PyDescr_NewMethod(PyTypeObject *type, PyMethodDef *method)
789789
type, method->ml_name);
790790
if (descr != NULL) {
791791
descr->d_method = method;
792-
descr->vectorcall = &_PyMethodDescr_FastCallKeywords;
792+
descr->vectorcall = _PyMethodDescr_Vectorcall;
793793
}
794794
return (PyObject *)descr;
795795
}

‎Objects/funcobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname
3737
op->func_defaults = NULL; /* No default arguments */
3838
op->func_kwdefaults = NULL; /* No keyword only defaults */
3939
op->func_closure = NULL;
40-
op->vectorcall = _PyFunction_FastCallKeywords;
40+
op->vectorcall = _PyFunction_Vectorcall;
4141

4242
consts = ((PyCodeObject *)code)->co_consts;
4343
if (PyTuple_Size(consts) >= 1) {

‎Objects/methodobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module)
5353
op->vectorcall = NULL;
5454
}
5555
else {
56-
op->vectorcall = &_PyCFunction_FastCallKeywords;
56+
op->vectorcall = _PyCFunction_Vectorcall;
5757
}
5858
_PyObject_GC_TRACK(op);
5959
return (PyObject *)op;

‎Python/ceval.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5352,9 +5352,9 @@ trace_call_function(PyThreadState *tstate,
53525352
PyObject *x;
53535353
if (PyCFunction_Check(func)) {
53545354
STACKLESS_GETARG();
5355-
STACKLESS_VECTORCALL_BEFORE(_PyCFunction_FastCallKeywords);
5356-
C_TRACE(x, _PyCFunction_FastCallKeywords(func, args, nargs, kwnames));
5357-
STACKLESS_VECTORCALL_AFTER(_PyCFunction_FastCallKeywords);
5355+
STACKLESS_VECTORCALL_BEFORE(_PyCFunction_Vectorcall);
5356+
C_TRACE(x, _PyCFunction_Vectorcall(func, args, nargs, kwnames));
5357+
STACKLESS_VECTORCALL_AFTER(_PyCFunction_Vectorcall);
53585358
return x;
53595359
}
53605360
else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) {
@@ -5371,11 +5371,11 @@ trace_call_function(PyThreadState *tstate,
53715371
if (func == NULL) {
53725372
return NULL;
53735373
}
5374-
STACKLESS_VECTORCALL_BEFORE(_PyCFunction_FastCallKeywords);
5375-
C_TRACE(x, _PyCFunction_FastCallKeywords(func,
5376-
args+1, nargs-1,
5377-
kwnames));
5378-
STACKLESS_VECTORCALL_AFTER(_PyCFunction_FastCallKeywords);
5374+
STACKLESS_VECTORCALL_BEFORE(_PyCFunction_Vectorcall);
5375+
C_TRACE(x, _PyCFunction_Vectorcall(func,
5376+
args+1, nargs-1,
5377+
kwnames));
5378+
STACKLESS_VECTORCALL_AFTER(_PyCFunction_Vectorcall);
53795379
Py_DECREF(func);
53805380
return x;
53815381
}

‎Tools/gdb/libpython.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ def is_other_python_frame(self):
15771577
return False
15781578

15791579
if caller in ('_PyCFunction_FastCallDict',
1580-
'_PyCFunction_FastCallKeywords',
1580+
'_PyCFunction_Vectorcall',
15811581
'cfunction_call_varargs'):
15821582
arg_name = 'func'
15831583
# Within that frame:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /