From 9b8d01efe2925185b8e92ee924412821bc10517c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:38:48 +0100
Subject: [PATCH 1/3] fix UBSan failures in `_abc.c`

---
 Modules/_abc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Modules/_abc.c b/Modules/_abc.c
index 4f4b24b035db4a..e6adedba9430f7 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -67,6 +67,8 @@ typedef struct {
     uint64_t _abc_negative_cache_version;
 } _abc_data;
 
+#define _abc_data_CAST(op)   ((_abc_data *)(op))
+
 static inline uint64_t
 get_cache_version(_abc_data *impl)
 {
@@ -88,8 +90,9 @@ set_cache_version(_abc_data *impl, uint64_t version)
 }
 
 static int
-abc_data_traverse(_abc_data *self, visitproc visit, void *arg)
+abc_data_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    _abc_data *self = _abc_data_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->_abc_registry);
     Py_VISIT(self->_abc_cache);
@@ -98,8 +101,9 @@ abc_data_traverse(_abc_data *self, visitproc visit, void *arg)
 }
 
 static int
-abc_data_clear(_abc_data *self)
+abc_data_clear(PyObject *op)
 {
+    _abc_data *self = _abc_data_CAST(op);
     Py_CLEAR(self->_abc_registry);
     Py_CLEAR(self->_abc_cache);
     Py_CLEAR(self->_abc_negative_cache);
@@ -107,7 +111,7 @@ abc_data_clear(_abc_data *self)
 }
 
 static void
-abc_data_dealloc(_abc_data *self)
+abc_data_dealloc(PyObject *self)
 {
     PyObject_GC_UnTrack(self);
     PyTypeObject *tp = Py_TYPE(self);
@@ -212,7 +216,7 @@ _destroy(PyObject *setweakref, PyObject *objweakref)
 }
 
 static PyMethodDef _destroy_def = {
-    "_destroy", (PyCFunction) _destroy, METH_O
+    "_destroy", _destroy, METH_O
 };
 
 static int

From 0b5088533f38c36f85f860227d533d428321c4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:38:55 +0100
Subject: [PATCH 2/3] suppress unused return values

---
 Modules/_abc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_abc.c b/Modules/_abc.c
index e6adedba9430f7..1ee1f4377cef21 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -968,7 +968,7 @@ _abcmodule_clear(PyObject *module)
 static void
 _abcmodule_free(void *module)
 {
-    _abcmodule_clear((PyObject *)module);
+    (void)_abcmodule_clear((PyObject *)module);
 }
 
 static PyModuleDef_Slot _abcmodule_slots[] = {

From db1afde70e94087b9a88da48c03655e9b839a472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Thu, 26 Dec 2024 09:43:53 +0100
Subject: [PATCH 3/3] fix indentation

---
 Modules/_abc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_abc.c b/Modules/_abc.c
index 1ee1f4377cef21..d6a953b336025d 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -67,7 +67,7 @@ typedef struct {
     uint64_t _abc_negative_cache_version;
 } _abc_data;
 
-#define _abc_data_CAST(op)   ((_abc_data *)(op))
+#define _abc_data_CAST(op)  ((_abc_data *)(op))
 
 static inline uint64_t
 get_cache_version(_abc_data *impl)