mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
bpo-29865: Use PyXXX_GET_SIZE macros rather than Py_SIZE for concrete types. (#748)
This commit is contained in:
parent
c61ac1642d
commit
fff9a31a91
13 changed files with 35 additions and 32 deletions
|
@ -321,11 +321,12 @@ _PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs,
|
|||
return function_code_fastcall(co, args, nargs, globals);
|
||||
}
|
||||
else if (nargs == 0 && argdefs != NULL
|
||||
&& co->co_argcount == Py_SIZE(argdefs)) {
|
||||
&& co->co_argcount == PyTuple_GET_SIZE(argdefs)) {
|
||||
/* function called with no arguments, but all parameters have
|
||||
a default value: use default values as arguments .*/
|
||||
args = &PyTuple_GET_ITEM(argdefs, 0);
|
||||
return function_code_fastcall(co, args, Py_SIZE(argdefs), globals);
|
||||
return function_code_fastcall(co, args, PyTuple_GET_SIZE(argdefs),
|
||||
globals);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -364,7 +365,7 @@ _PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs,
|
|||
|
||||
if (argdefs != NULL) {
|
||||
d = &PyTuple_GET_ITEM(argdefs, 0);
|
||||
nd = Py_SIZE(argdefs);
|
||||
nd = PyTuple_GET_SIZE(argdefs);
|
||||
}
|
||||
else {
|
||||
d = NULL;
|
||||
|
@ -406,11 +407,12 @@ _PyFunction_FastCallKeywords(PyObject *func, PyObject **stack,
|
|||
return function_code_fastcall(co, stack, nargs, globals);
|
||||
}
|
||||
else if (nargs == 0 && argdefs != NULL
|
||||
&& co->co_argcount == Py_SIZE(argdefs)) {
|
||||
&& co->co_argcount == PyTuple_GET_SIZE(argdefs)) {
|
||||
/* function called with no arguments, but all parameters have
|
||||
a default value: use default values as arguments .*/
|
||||
stack = &PyTuple_GET_ITEM(argdefs, 0);
|
||||
return function_code_fastcall(co, stack, Py_SIZE(argdefs), globals);
|
||||
return function_code_fastcall(co, stack, PyTuple_GET_SIZE(argdefs),
|
||||
globals);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -421,7 +423,7 @@ _PyFunction_FastCallKeywords(PyObject *func, PyObject **stack,
|
|||
|
||||
if (argdefs != NULL) {
|
||||
d = &PyTuple_GET_ITEM(argdefs, 0);
|
||||
nd = Py_SIZE(argdefs);
|
||||
nd = PyTuple_GET_SIZE(argdefs);
|
||||
}
|
||||
else {
|
||||
d = NULL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue