Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into fix/ubsan/testcapim…
…odule-111178
  • Loading branch information
picnixz committed Mar 23, 2025
commit 82e1692fc7c198ef66a5343087f34c9efbf70d7a
6 changes: 3 additions & 3 deletions Modules/_testcapimodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -2945,15 +2945,15 @@ typedef struct {
static void
generic_alias_dealloc(PyObject *op)
{
PyGenericAliasObject *self = PyGenericAliasObject_CAST(op);
PyGenericAliasObject *self = (PyGenericAliasObject*)op;
Py_CLEAR(self->item);
Py_TYPE(self)->tp_free(self);
}

static PyObject *
generic_alias_mro_entries(PyObject *op, PyObject *Py_UNUSED(bases))
{
PyGenericAliasObject *self = PyGenericAliasObject_CAST(op);
PyGenericAliasObject *self = (PyGenericAliasObject*)op;
return PyTuple_Pack(1, self->item);
}

Expand Down Expand Up @@ -3102,7 +3102,7 @@ ContainerNoGC_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
static void
ContainerNoGC_dealloc(PyObject *op)
{
ContainerNoGCobject *self = ContainerNoGCobject_CAST(op);
ContainerNoGCobject *self = (ContainerNoGCobject*)op;
Py_DECREF(self->value);
Py_TYPE(self)->tp_free(self);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.