ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gh-104922: Make PY_SSIZE_T_CLEAN not mandatory again (#105051)

Browse source
This commit is contained in:
Inada Naoki 2023-05-31 18:38:55 +09:00 • committed by GitHub
parent f90d3f68db
commit adccff3b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 105 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Objects/call.c
View file

@ -519,7 +519,7 @@ _PyObject_Call_Prepend(PyThreadState *tstate, PyObject *callable,
static PyObject *
_PyObject_CallFunctionVa(PyThreadState *tstate, PyObject *callable,
const char *format, va_list va, int is_size_t)
const char *format, va_list va)
{
PyObject* small_stack[_PY_FASTCALL_SMALL_STACK];
const Py_ssize_t small_stack_len = Py_ARRAY_LENGTH(small_stack);
@ -535,14 +535,8 @@ _PyObject_CallFunctionVa(PyThreadState *tstate, PyObject *callable,
return _PyObject_CallNoArgsTstate(tstate, callable);
}
if (is_size_t) {
stack = _Py_VaBuildStack_SizeT(small_stack, small_stack_len,
format, va, &nargs);
}
else {
stack = _Py_VaBuildStack(small_stack, small_stack_len,
format, va, &nargs);
}
stack = _Py_VaBuildStack(small_stack, small_stack_len,
format, va, &nargs);
if (stack == NULL) {
return NULL;
}
@ -581,7 +575,7 @@ PyObject_CallFunction(PyObject *callable, const char *format, ...)
PyThreadState *tstate = _PyThreadState_GET();
va_start(va, format);
result = _PyObject_CallFunctionVa(tstate, callable, format, va, 0);
result = _PyObject_CallFunctionVa(tstate, callable, format, va);
va_end(va);
return result;
@ -599,21 +593,24 @@ PyEval_CallFunction(PyObject *callable, const char *format, ...)
PyThreadState *tstate = _PyThreadState_GET();
va_start(va, format);
result = _PyObject_CallFunctionVa(tstate, callable, format, va, 0);
result = _PyObject_CallFunctionVa(tstate, callable, format, va);
va_end(va);
return result;
}
PyObject *
/* _PyObject_CallFunction_SizeT is exact copy of PyObject_CallFunction.
* This function must be kept because it is part of the stable ABI.
*/
PyAPI_FUNC(PyObject *) /* abi_only */
_PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
{
PyThreadState *tstate = _PyThreadState_GET();
va_list va;
va_start(va, format);
PyObject *result = _PyObject_CallFunctionVa(tstate, callable, format, va, 1);
PyObject *result = _PyObject_CallFunctionVa(tstate, callable, format, va);
va_end(va);
return result;
@ -621,7 +618,7 @@ _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...)
static PyObject*
callmethod(PyThreadState *tstate, PyObject* callable, const char *format, va_list va, int is_size_t)
callmethod(PyThreadState *tstate, PyObject* callable, const char *format, va_list va)
{
assert(callable != NULL);
if (!PyCallable_Check(callable)) {
@ -631,7 +628,7 @@ callmethod(PyThreadState *tstate, PyObject* callable, const char *format, va_lis
return NULL;
}
return _PyObject_CallFunctionVa(tstate, callable, format, va, is_size_t);
return _PyObject_CallFunctionVa(tstate, callable, format, va);
}
PyObject *
@ -650,7 +647,7 @@ PyObject_CallMethod(PyObject *obj, const char *name, const char *format, ...)
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 0);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
Py_DECREF(callable);
@ -676,7 +673,7 @@ PyEval_CallMethod(PyObject *obj, const char *name, const char *format, ...)
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 0);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
Py_DECREF(callable);
@ -700,7 +697,7 @@ _PyObject_CallMethod(PyObject *obj, PyObject *name,
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 1);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
Py_DECREF(callable);
@ -724,7 +721,7 @@ _PyObject_CallMethodId(PyObject *obj, _Py_Identifier *name,
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 0);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
Py_DECREF(callable);
@ -737,13 +734,15 @@ PyObject * _PyObject_CallMethodFormat(PyThreadState *tstate, PyObject *callable,
{
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 0);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
return retval;
}
PyObject *
// _PyObject_CallMethod_SizeT is exact copy of PyObject_CallMethod.
// This function must be kept because it is part of the stable ABI.
PyAPI_FUNC(PyObject *) /* abi_only */
_PyObject_CallMethod_SizeT(PyObject *obj, const char *name,
const char *format, ...)
{
@ -759,31 +758,7 @@ _PyObject_CallMethod_SizeT(PyObject *obj, const char *name,
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 1);
va_end(va);
Py_DECREF(callable);
return retval;
}
PyObject *
_PyObject_CallMethodId_SizeT(PyObject *obj, _Py_Identifier *name,
const char *format, ...)
{
PyThreadState *tstate = _PyThreadState_GET();
if (obj == NULL || name == NULL) {
return null_error(tstate);
}
PyObject *callable = _PyObject_GetAttrId(obj, name);
if (callable == NULL) {
return NULL;
}
va_list va;
va_start(va, format);
PyObject *retval = callmethod(tstate, callable, format, va, 1);
PyObject *retval = callmethod(tstate, callable, format, va);
va_end(va);
Py_DECREF(callable);