avoid cast

xuantengh · xuantengh · commit b636d0737606 · 2025-06-20T10:46:39.000+08:00
diff --git a/Modules/_testcapi/heaptype.c b/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);
diff --git a/Objects/classobject.c b/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));
diff --git a/Objects/funcobject.c b/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);
diff --git a/Objects/genericaliasobject.c b/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);
diff --git a/Objects/methodobject.c b/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.
diff --git a/Objects/odictobject.c b/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);
diff --git a/Objects/picklebufobject.c b/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);
 }
diff --git a/Objects/setobject.c b/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) {
diff --git a/Objects/unionobject.c b/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);

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ heapctypewithweakref_dealloc(PyObject *op)`
`1034`	`1034`	`{`
`1035`	`1035`	`HeapCTypeWithWeakrefObject self = (HeapCTypeWithWeakrefObject)op;`
`1036`	`1036`	`PyTypeObject *tp = Py_TYPE(self);`
`1037`		`- PyObject_ClearWeakRefs((PyObject *) self);`
	`1037`	`+ PyObject_ClearWeakRefs(op);`
`1038`	`1038`	`Py_XDECREF(self->weakreflist);`
`1039`	`1039`	`PyObject_Free(self);`
`1040`	`1040`	`Py_DECREF(tp);`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ method_dealloc(PyObject *self)`
`245`	`245`	`{`
`246`	`246`	`PyMethodObject *im = _PyMethodObject_CAST(self);`
`247`	`247`	`_PyObject_GC_UNTRACK(im);`
`248`		`- PyObject_ClearWeakRefs((PyObject *)im);`
	`248`	`+ PyObject_ClearWeakRefs(self);`
`249`	`249`	`Py_DECREF(im->im_func);`
`250`	`250`	`Py_XDECREF(im->im_self);`
`251`	`251`	`assert(Py_IS_TYPE(self, &PyMethod_Type));`
Original file line number	Diff line number	Diff line change
`@@ -1148,7 +1148,7 @@ func_dealloc(PyObject *self)`
`1148`	`1148`	`return;`
`1149`	`1149`	`}`
`1150`	`1150`	`_PyObject_GC_UNTRACK(op);`
`1151`		`- PyObject_ClearWeakRefs((PyObject *) op);`
	`1151`	`+ PyObject_ClearWeakRefs(self);`
`1152`	`1152`	`(void)func_clear((PyObject*)op);`
`1153`	`1153`	`// These aren't cleared by func_clear().`
`1154`	`1154`	`_Py_DECREF_CODE((PyCodeObject *)op->func_code);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ meth_dealloc(PyObject *self)`
`167`	`167`	`{`
`168`	`168`	`PyCFunctionObject *m = _PyCFunctionObject_CAST(self);`
`169`	`169`	`PyObject_GC_UnTrack(m);`
`170`		`- PyObject_ClearWeakRefs((PyObject*) m);`
	`170`	`+ PyObject_ClearWeakRefs(self);`
`171`	`171`	`// We need to access ml_flags here rather than later.`
`172`	`172`	// `m->m_ml` might have the same lifetime
`173`	`173`	// as `m_self` when it's dynamically allocated.
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ picklebuf_dealloc(PyObject *op)`
`111`	`111`	`{`
`112`	`112`	`PyPickleBufferObject self = (PyPickleBufferObject)op;`
`113`	`113`	`PyObject_GC_UnTrack(self);`
`114`		`- PyObject_ClearWeakRefs((PyObject *) self);`
	`114`	`+ PyObject_ClearWeakRefs(op);`
`115`	`115`	`PyBuffer_Release(&self->view);`
`116`	`116`	`Py_TYPE(self)->tp_free((PyObject *) self);`
`117`	`117`	`}`