avoid cast

Author: xuantengh

Modules/_testcapi/heaptype.c

@@ -1034,7 +1034,7 @@ heapctypewithweakref_dealloc(PyObject *op)
 {
     HeapCTypeWithWeakrefObject *self = (HeapCTypeWithWeakrefObject*)op;
     PyTypeObject *tp = Py_TYPE(self);
-    PyObject_ClearWeakRefs((PyObject *) self);
+    PyObject_ClearWeakRefs(op);
     Py_XDECREF(self->weakreflist);
     PyObject_Free(self);
     Py_DECREF(tp);

Modules/_threadmodule.c

@@ -1365,9 +1365,7 @@ static void
 localdummy_dealloc(PyObject *op)
 {
     localdummyobject *self = localdummyobject_CAST(op);
-    if (self->weakreflist != NULL) {
-        PyObject_ClearWeakRefs(op);
-    }
+    PyObject_ClearWeakRefs(op);
     PyTypeObject *tp = Py_TYPE(self);
     tp->tp_free(self);
     Py_DECREF(tp);

Objects/classobject.c

@@ -245,7 +245,7 @@ method_dealloc(PyObject *self)
 {
     PyMethodObject *im = _PyMethodObject_CAST(self);
     _PyObject_GC_UNTRACK(im);
-    PyObject_ClearWeakRefs((PyObject *)im);
+    PyObject_ClearWeakRefs(self);
     Py_DECREF(im->im_func);
     Py_XDECREF(im->im_self);
     assert(Py_IS_TYPE(self, &PyMethod_Type));

Objects/funcobject.c

@@ -1148,7 +1148,7 @@ func_dealloc(PyObject *self)
         return;
     }
     _PyObject_GC_UNTRACK(op);
-    PyObject_ClearWeakRefs((PyObject *) op);
+    PyObject_ClearWeakRefs(self);
     (void)func_clear((PyObject*)op);
     // These aren't cleared by func_clear().
     _Py_DECREF_CODE((PyCodeObject *)op->func_code);

Objects/genericaliasobject.c

@@ -33,7 +33,7 @@ ga_dealloc(PyObject *self)
     gaobject *alias = (gaobject *)self;
 
     _PyObject_GC_UNTRACK(self);
-    PyObject_ClearWeakRefs((PyObject *)alias);
+    PyObject_ClearWeakRefs(self);
     Py_XDECREF(alias->origin);
     Py_XDECREF(alias->args);
     Py_XDECREF(alias->parameters);

Objects/methodobject.c

@@ -167,7 +167,7 @@ meth_dealloc(PyObject *self)
 {
     PyCFunctionObject *m = _PyCFunctionObject_CAST(self);
     PyObject_GC_UnTrack(m);
-    PyObject_ClearWeakRefs((PyObject*) m);
+    PyObject_ClearWeakRefs(self);
     // We need to access ml_flags here rather than later.
     // `m->m_ml` might have the same lifetime
     // as `m_self` when it's dynamically allocated.

Objects/odictobject.c

@@ -1391,7 +1391,7 @@ odict_dealloc(PyObject *op)
     PyObject_GC_UnTrack(self);
 
     Py_XDECREF(self->od_inst_dict);
-    PyObject_ClearWeakRefs((PyObject *)self);
+    PyObject_ClearWeakRefs(op);
 
     _odict_clear_nodes(self);
     PyDict_Type.tp_dealloc((PyObject *)self);

Objects/picklebufobject.c

@@ -111,7 +111,7 @@ picklebuf_dealloc(PyObject *op)
 {
     PyPickleBufferObject *self = (PyPickleBufferObject*)op;
     PyObject_GC_UnTrack(self);
-    PyObject_ClearWeakRefs((PyObject *) self);
+    PyObject_ClearWeakRefs(op);
     PyBuffer_Release(&self->view);
     Py_TYPE(self)->tp_free((PyObject *) self);
 }

Objects/setobject.c

@@ -536,7 +536,7 @@ set_dealloc(PyObject *self)
 
     /* bpo-31095: UnTrack is needed before calling any callbacks */
     PyObject_GC_UnTrack(so);
-    PyObject_ClearWeakRefs((PyObject *) so);
+    PyObject_ClearWeakRefs(self);
 
     for (entry = so->table; used > 0; entry++) {
         if (entry->key && entry->key != dummy) {

Objects/unionobject.c

@@ -21,7 +21,7 @@ unionobject_dealloc(PyObject *self)
     unionobject *alias = (unionobject *)self;
 
     _PyObject_GC_UNTRACK(self);
-    PyObject_ClearWeakRefs((PyObject *)alias);
+    PyObject_ClearWeakRefs(self);
 
     Py_XDECREF(alias->args);
     Py_XDECREF(alias->hashable_args);