From: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com> Date: Wed, 20 Apr 2022 15:15:45 +0000 (-0400) Subject: Cast to (destructor) to fix compiler warnings (GH-91711) X-Git-Tag: v3.11.0b1~281 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7d7e6c00778d234fda2c2229faccec5e8f48643;p=thirdparty%2FPython%2Fcpython.git Cast to (destructor) to fix compiler warnings (GH-91711) --- diff --git a/Objects/longobject.c b/Objects/longobject.c index c104dcc14f98..660824f90659 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -40,7 +40,7 @@ static inline void _Py_DECREF_INT(PyLongObject *op) { assert(PyLong_CheckExact(op)); - _Py_DECREF_SPECIALIZED((PyObject *)op, PyObject_Free); + _Py_DECREF_SPECIALIZED((PyObject *)op, (destructor)PyObject_Free); } static inline int diff --git a/Python/ceval.c b/Python/ceval.c index 45754ffbe7cb..12b0aef774e3 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1977,8 +1977,8 @@ handle_eval_breaker: STAT_INC(BINARY_OP, hit); PyObject *prod = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right); SET_SECOND(prod); - _Py_DECREF_SPECIALIZED(right, PyObject_Free); - _Py_DECREF_SPECIALIZED(left, PyObject_Free); + _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); + _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); STACK_SHRINK(1); if (prod == NULL) { goto error; @@ -2017,8 +2017,8 @@ handle_eval_breaker: STAT_INC(BINARY_OP, hit); PyObject *sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right); SET_SECOND(sub); - _Py_DECREF_SPECIALIZED(right, PyObject_Free); - _Py_DECREF_SPECIALIZED(left, PyObject_Free); + _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); + _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); STACK_SHRINK(1); if (sub == NULL) { goto error; @@ -2132,8 +2132,8 @@ handle_eval_breaker: STAT_INC(BINARY_OP, hit); PyObject *sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right); SET_SECOND(sum); - _Py_DECREF_SPECIALIZED(right, PyObject_Free); - _Py_DECREF_SPECIALIZED(left, PyObject_Free); + _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); + _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); STACK_SHRINK(1); if (sum == NULL) { goto error; @@ -2192,7 +2192,7 @@ handle_eval_breaker: assert(res != NULL); Py_INCREF(res); STACK_SHRINK(1); - _Py_DECREF_SPECIALIZED(sub, PyObject_Free); + _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); SET_TOP(res); Py_DECREF(list); JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR); @@ -2217,7 +2217,7 @@ handle_eval_breaker: assert(res != NULL); Py_INCREF(res); STACK_SHRINK(1); - _Py_DECREF_SPECIALIZED(sub, PyObject_Free); + _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); SET_TOP(res); Py_DECREF(tuple); JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR); @@ -2359,7 +2359,7 @@ handle_eval_breaker: STACK_SHRINK(3); assert(old_value != NULL); Py_DECREF(old_value); - _Py_DECREF_SPECIALIZED(sub, PyObject_Free); + _Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free); Py_DECREF(list); JUMPBY(INLINE_CACHE_ENTRIES_STORE_SUBSCR); NOTRACE_DISPATCH(); @@ -3795,8 +3795,8 @@ handle_eval_breaker: JUMPBY(INLINE_CACHE_ENTRIES_COMPARE_OP); NEXTOPARG(); STACK_SHRINK(2); - _Py_DECREF_SPECIALIZED(left, PyObject_Free); - _Py_DECREF_SPECIALIZED(right, PyObject_Free); + _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free); + _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free); assert(opcode == POP_JUMP_FORWARD_IF_FALSE || opcode == POP_JUMP_BACKWARD_IF_FALSE || opcode == POP_JUMP_FORWARD_IF_TRUE ||