Merge branch 'main' into warnings-as-error-2

Author: graingert

Doc/c-api/type.rst

@@ -311,10 +311,6 @@ The following functions and structs are used to create
 
    Metaclasses that override :c:member:`~PyTypeObject.tp_new` are not
    supported, except if ``tp_new`` is ``NULL``.
-   (For backwards compatibility, other ``PyType_From*`` functions allow
-   such metaclasses. They ignore ``tp_new``, which may result in incomplete
-   initialization. This is deprecated and in Python 3.14+ such metaclasses will
-   not be supported.)
 
    The *bases* argument can be used to specify base classes; it can either
    be only one class or a tuple of classes.

Modules/_ctypes/_ctypes.c

@@ -410,9 +410,11 @@ typedef struct {
 #define _StructParamObject_CAST(op) ((StructParamObject *)(op))
 
 static int
-StructParam_traverse(PyObject *self, visitproc visit, void *arg)
+StructParam_traverse(PyObject *myself, visitproc visit, void *arg)
 {
+    StructParamObject *self = _StructParamObject_CAST(myself);
     Py_VISIT(Py_TYPE(self));
+    Py_VISIT(self->keep);
     return 0;
 }
 
@@ -2378,6 +2380,7 @@ PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
         }
         StgInfo *sw_info;
         if (PyStgInfo_FromType(st, swapped, &sw_info) < 0) {
+            Py_DECREF(swapped);
             return -1;
         }
         assert(sw_info);
@@ -2674,6 +2677,7 @@ make_funcptrtype_dict(ctypes_state *st, PyObject *attrdict, StgInfo *stginfo)
     if (ob) {
         StgInfo *info;
         if (PyStgInfo_FromType(st, ob, &info) < 0) {
+            Py_DECREF(ob);
             return -1;
         }
         if (ob != Py_None && !info && !PyCallable_Check(ob)) {
@@ -5650,6 +5654,10 @@ Pointer_subscript(PyObject *myself, PyObject *item)
 
         for (cur = start, i = 0; i < len; cur += step, i++) {
             PyObject *v = Pointer_item(myself, cur);
+            if (!v) {
+                Py_DECREF(np);
+                return NULL;
+            }
             PyList_SET_ITEM(np, i, v);
         }
         return np;
@@ -6062,6 +6070,18 @@ _ctypes_add_objects(PyObject *mod)
 static int
 _ctypes_mod_exec(PyObject *mod)
 {
+    // See https://github.com/python/cpython/issues/128485
+    // This allocates some memory and then frees it to ensure that the
+    // the dlmalloc allocator initializes itself to avoid data races
+    // in free-threading.
+    void *codeloc = NULL;
+    void *ptr = Py_ffi_closure_alloc(sizeof(void *), &codeloc);
+    if (ptr == NULL) {
+        PyErr_NoMemory();
+        return -1;
+    }
+    Py_ffi_closure_free(ptr);
+
     ctypes_state *st = get_module_state(mod);
     st->_unpickle = PyObject_GetAttrString(mod, "_unpickle");
     if (st->_unpickle == NULL) {
@@ -6189,9 +6209,3 @@ PyInit__ctypes(void)
 {
     return PyModuleDef_Init(&_ctypesmodule);
 }
-
-/*
- Local Variables:
- compile-command: "cd .. && python setup.py -q build -g && python setup.py -q build install --home ~"
- End:
-*/

Modules/_ctypes/stgdict.c

@@ -225,8 +225,8 @@ PyCStructUnionType_update_stginfo(PyObject *type, PyObject *fields, int isStruct
     // They're cleared on error.
     PyObject *layout_func = NULL;
     PyObject *kwnames = NULL;
-    PyObject* align = NULL;
-    PyObject* size = NULL;
+    PyObject *align_obj = NULL;
+    PyObject *size_obj = NULL;
     PyObject *layout_fields_obj = NULL;
     PyObject *layout_fields = NULL;
     PyObject *layout = NULL;
@@ -291,12 +291,12 @@ PyCStructUnionType_update_stginfo(PyObject *type, PyObject *fields, int isStruct
         goto error;
     }
 
-    align = PyObject_GetAttr(layout, &_Py_ID(align));
-    if (!align) {
+    align_obj = PyObject_GetAttr(layout, &_Py_ID(align));
+    if (!align_obj) {
         goto error;
     }
-    Py_ssize_t total_align = PyLong_AsSsize_t(align);
-    Py_CLEAR(align);
+    Py_ssize_t total_align = PyLong_AsSsize_t(align_obj);
+    Py_CLEAR(align_obj);
     if (total_align < 0) {
         if (!PyErr_Occurred()) {
             PyErr_SetString(PyExc_ValueError,
@@ -305,12 +305,12 @@ PyCStructUnionType_update_stginfo(PyObject *type, PyObject *fields, int isStruct
         goto error;
     }
 
-    size = PyObject_GetAttr(layout, &_Py_ID(size));
-    if (!size) {
+    size_obj = PyObject_GetAttr(layout, &_Py_ID(size));
+    if (!size_obj) {
         goto error;
     }
-    Py_ssize_t total_size = PyLong_AsSsize_t(size);
-    Py_CLEAR(size);
+    Py_ssize_t total_size = PyLong_AsSsize_t(size_obj);
+    Py_CLEAR(size_obj);
     if (total_size < 0) {
         if (!PyErr_Occurred()) {
             PyErr_SetString(PyExc_ValueError,
@@ -669,8 +669,8 @@ PyCStructUnionType_update_stginfo(PyObject *type, PyObject *fields, int isStruct
 error:
     Py_XDECREF(layout_func);
     Py_XDECREF(kwnames);
-    Py_XDECREF(align);
-    Py_XDECREF(size);
+    Py_XDECREF(align_obj);
+    Py_XDECREF(size_obj);
     Py_XDECREF(layout_fields_obj);
     Py_XDECREF(layout_fields);
     Py_XDECREF(layout);

Modules/_testbuffer.c

@@ -1586,8 +1586,9 @@ ptr_from_index(Py_buffer *base, Py_ssize_t index)
 }
 
 static PyObject *
-ndarray_item(NDArrayObject *self, Py_ssize_t index)
+ndarray_item(PyObject *op, Py_ssize_t index)
 {
+    NDArrayObject *self = (NDArrayObject *)op;
     ndbuf_t *ndbuf = self->head;
     Py_buffer *base = &ndbuf->base;
     char *ptr;
@@ -1801,7 +1802,7 @@ ndarray_subscript(PyObject *op, PyObject *key)
         Py_ssize_t index = PyLong_AsSsize_t(key);
         if (index == -1 && PyErr_Occurred())
             return NULL;
-        return ndarray_item(self, index);
+        return ndarray_item(op, index);
     }
 
     nd = (NDArrayObject *)ndarray_new(&NDArray_Type, NULL, NULL);
@@ -1966,10 +1967,10 @@ static PyMappingMethods ndarray_as_mapping = {
 };
 
 static PySequenceMethods ndarray_as_sequence = {
-        0,                                /* sq_length */
-        0,                                /* sq_concat */
-        0,                                /* sq_repeat */
-        (ssizeargfunc)ndarray_item,       /* sq_item */
+    0,              /* sq_length */
+    0,              /* sq_concat */
+    0,              /* sq_repeat */
+    ndarray_item,   /* sq_item */
 };
 
 
@@ -2742,16 +2743,17 @@ staticarray_init(PyObject *self, PyObject *args, PyObject *kwds)
 }
 
 static void
-staticarray_dealloc(StaticArrayObject *self)
+staticarray_dealloc(PyObject *self)
 {
     PyObject_Free(self);
 }
 
 /* Return a buffer for a PyBUF_FULL_RO request. Flags are not checked,
    which makes this object a non-compliant exporter! */
 static int
-staticarray_getbuf(StaticArrayObject *self, Py_buffer *view, int flags)
+staticarray_getbuf(PyObject *op, Py_buffer *view, int flags)
 {
+    StaticArrayObject *self = (StaticArrayObject *)op;
     *view = static_buffer;
 
     if (self->legacy_mode) {
@@ -2765,7 +2767,7 @@ staticarray_getbuf(StaticArrayObject *self, Py_buffer *view, int flags)
 }
 
 static PyBufferProcs staticarray_as_buffer = {
-    (getbufferproc)staticarray_getbuf, /* bf_getbuffer */
+    staticarray_getbuf,                /* bf_getbuffer */
     NULL,                              /* bf_releasebuffer */
 };
 
@@ -2774,7 +2776,7 @@ static PyTypeObject StaticArray_Type = {
     "staticarray",                   /* Name of this type */
     sizeof(StaticArrayObject),       /* Basic object size */
     0,                               /* Item size for varobject */
-    (destructor)staticarray_dealloc, /* tp_dealloc */
+    staticarray_dealloc,             /* tp_dealloc */
     0,                               /* tp_vectorcall_offset */
     0,                               /* tp_getattr */
     0,                               /* tp_setattr */

Modules/_testcapi/buffer.c

@@ -11,6 +11,8 @@ typedef struct {
     Py_ssize_t references;
 } testBufObject;
 
+#define testBufObject_CAST(op)  ((testBufObject *)(op))
+
 static PyObject *
 testbuf_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
@@ -29,30 +31,34 @@ testbuf_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 static int
-testbuf_traverse(testBufObject *self, visitproc visit, void *arg)
+testbuf_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    testBufObject *self = testBufObject_CAST(op);
     Py_VISIT(self->obj);
     return 0;
 }
 
 static int
-testbuf_clear(testBufObject *self)
+testbuf_clear(PyObject *op)
 {
+    testBufObject *self = testBufObject_CAST(op);
     Py_CLEAR(self->obj);
     return 0;
 }
 
 static void
-testbuf_dealloc(testBufObject *self)
+testbuf_dealloc(PyObject *op)
 {
+    testBufObject *self = testBufObject_CAST(op);
     PyObject_GC_UnTrack(self);
     Py_XDECREF(self->obj);
-    Py_TYPE(self)->tp_free((PyObject *) self);
+    Py_TYPE(self)->tp_free(self);
 }
 
 static int
-testbuf_getbuf(testBufObject *self, Py_buffer *view, int flags)
+testbuf_getbuf(PyObject *op, Py_buffer *view, int flags)
 {
+    testBufObject *self = testBufObject_CAST(op);
     int buf = PyObject_GetBuffer(self->obj, view, flags);
     if (buf == 0) {
         Py_SETREF(view->obj, Py_NewRef(self));
@@ -62,15 +68,16 @@ testbuf_getbuf(testBufObject *self, Py_buffer *view, int flags)
 }
 
 static void
-testbuf_releasebuf(testBufObject *self, Py_buffer *view)
+testbuf_releasebuf(PyObject *op, Py_buffer *Py_UNUSED(view))
 {
+    testBufObject *self = testBufObject_CAST(op);
     self->references--;
     assert(self->references >= 0);
 }
 
 static PyBufferProcs testbuf_as_buffer = {
-    .bf_getbuffer = (getbufferproc) testbuf_getbuf,
-    .bf_releasebuffer = (releasebufferproc) testbuf_releasebuf,
+    .bf_getbuffer = testbuf_getbuf,
+    .bf_releasebuffer = testbuf_releasebuf,
 };
 
 static struct PyMemberDef testbuf_members[] = {
@@ -84,9 +91,9 @@ static PyTypeObject testBufType = {
     .tp_basicsize = sizeof(testBufObject),
     .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
     .tp_new = testbuf_new,
-    .tp_dealloc = (destructor) testbuf_dealloc,
-    .tp_traverse = (traverseproc) testbuf_traverse,
-    .tp_clear = (inquiry) testbuf_clear,
+    .tp_dealloc = testbuf_dealloc,
+    .tp_traverse = testbuf_traverse,
+    .tp_clear = testbuf_clear,
     .tp_as_buffer = &testbuf_as_buffer,
     .tp_members = testbuf_members
 };

Modules/_testcapi/monitoring.c

@@ -14,6 +14,7 @@ typedef struct {
     /* Other fields */
 } PyCodeLikeObject;
 
+#define PyCodeLikeObject_CAST(op)   ((PyCodeLikeObject *)(op))
 
 static PyObject *
 CodeLike_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
@@ -40,17 +41,19 @@ CodeLike_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 static void
-CodeLike_dealloc(PyCodeLikeObject *self)
+CodeLike_dealloc(PyObject *op)
 {
+    PyCodeLikeObject *self = PyCodeLikeObject_CAST(op);
     if (self->monitoring_states) {
         PyMem_Free(self->monitoring_states);
     }
     Py_TYPE(self)->tp_free((PyObject *) self);
 }
 
 static PyObject *
-CodeLike_str(PyCodeLikeObject *self)
+CodeLike_str(PyObject *op)
 {
+    PyCodeLikeObject *self = PyCodeLikeObject_CAST(op);
     PyObject *res = NULL;
     PyObject *sep = NULL;
     PyObject *parts = NULL;
@@ -101,8 +104,8 @@ static PyTypeObject PyCodeLike_Type = {
     .tp_itemsize = 0,
     .tp_flags = Py_TPFLAGS_DEFAULT,
     .tp_new = CodeLike_new,
-    .tp_dealloc = (destructor) CodeLike_dealloc,
-    .tp_str = (reprfunc) CodeLike_str,
+    .tp_dealloc = CodeLike_dealloc,
+    .tp_str = CodeLike_str,
 };
 
 #define RAISE_UNLESS_CODELIKE(v)  if (!Py_IS_TYPE((v), &PyCodeLike_Type)) { \