Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-99300: Replace Py_INCREF() with Py_NewRef() #99513

Merged
merged 1 commit into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 2 additions & 4 deletions Modules/_asynciomodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1756,8 +1756,7 @@ future_new_iter(PyObject *fut)
}
}

Py_INCREF(fut);
it->future = (FutureObj*)fut;
it->future = (FutureObj*)Py_NewRef(fut);
PyObject_GC_Track(it);
return (PyObject*)it;
}
Expand Down Expand Up @@ -1821,8 +1820,7 @@ static PyObject *
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o, void *Py_UNUSED(ignored))
{
if (o->sw_task) {
Py_INCREF(o->sw_task);
return (PyObject*)o->sw_task;
return Py_NewRef(o->sw_task);
}
Py_RETURN_NONE;
}
Expand Down
3 changes: 1 addition & 2 deletions Modules/_ctypes/_ctypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2937,8 +2937,7 @@ PyCData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr)
assert(CDataObject_Check(base));
cmem->b_ptr = adr;
cmem->b_needsfree = 0;
Py_INCREF(base);
cmem->b_base = (CDataObject *)base;
cmem->b_base = (CDataObject *)Py_NewRef(base);
cmem->b_index = index;
} else { /* copy contents of adr */
if (-1 == PyCData_MallocBuffer(cmem, dict)) {
Expand Down
3 changes: 1 addition & 2 deletions Modules/_ctypes/cfield.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@ PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type)
{
CDataObject *src;
if (inst == NULL) {
Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}
if (!CDataObject_Check(inst)) {
PyErr_SetString(PyExc_TypeError,
Expand Down
12 changes: 4 additions & 8 deletions Modules/_elementtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,7 @@ _elementtree_Element___getstate___impl(ElementObject *self)
if (!children)
return NULL;
for (i = 0; i < PyList_GET_SIZE(children); i++) {
PyObject *child = self->extra->children[i];
Py_INCREF(child);
PyObject *child = Py_NewRef(self->extra->children[i]);
PyList_SET_ITEM(children, i, child);
}

Expand Down Expand Up @@ -1365,8 +1364,7 @@ _elementtree_Element_get_impl(ElementObject *self, PyObject *key,
/*[clinic end generated code: output=523c614142595d75 input=ee153bbf8cdb246e]*/
{
if (self->extra && self->extra->attrib) {
PyObject *attrib = self->extra->attrib;
Py_INCREF(attrib);
PyObject *attrib = Py_NewRef(self->extra->attrib);
PyObject *value = PyDict_GetItemWithError(attrib, key);
Py_XINCREF(value);
Py_DECREF(attrib);
Expand Down Expand Up @@ -1723,8 +1721,7 @@ element_subscr(PyObject* self_, PyObject* item)

for (cur = start, i = 0; i < slicelen;
cur += step, i++) {
PyObject* item = self->extra->children[cur];
Py_INCREF(item);
PyObject* item = Py_NewRef(self->extra->children[cur]);
PyList_SET_ITEM(list, i, item);
}

Expand Down Expand Up @@ -2761,8 +2758,7 @@ treebuilder_handle_end(TreeBuilderObject* self, PyObject* tag)
if (treebuilder_append_event(self, self->end_event_obj, self->last) < 0)
return NULL;

Py_INCREF(self->last);
return (PyObject*) self->last;
return Py_NewRef(self->last);
}

LOCAL(PyObject*)
Expand Down
3 changes: 1 addition & 2 deletions Modules/_testbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1787,8 +1787,7 @@ ndarray_subscript(NDArrayObject *self, PyObject *key)
return unpack_single(base->buf, base->format, base->itemsize);
}
else if (key == Py_Ellipsis) {
Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}
else {
PyErr_SetString(PyExc_TypeError, "invalid indexing of scalar");
Expand Down
6 changes: 2 additions & 4 deletions Modules/_testcapi/datetime.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,9 @@ get_timezone_utc_capi(PyObject *self, PyObject *args)
return NULL;
}
if (macro) {
Py_INCREF(PyDateTime_TimeZone_UTC);
return PyDateTime_TimeZone_UTC;
return Py_NewRef(PyDateTime_TimeZone_UTC);
}
Py_INCREF(PyDateTimeAPI->TimeZone_UTC);
return PyDateTimeAPI->TimeZone_UTC;
return Py_NewRef(PyDateTimeAPI->TimeZone_UTC);
}

static PyObject *
Expand Down
3 changes: 1 addition & 2 deletions Modules/mmapmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,8 +746,7 @@ mmap__enter__method(mmap_object *self, PyObject *args)
{
CHECK_VALID(NULL);

Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}

static PyObject *
Expand Down
3 changes: 1 addition & 2 deletions Modules/selectmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1652,8 +1652,7 @@ select_epoll___enter___impl(pyEpoll_Object *self)
if (self->epfd < 0)
return pyepoll_err_closed();

Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}

/*[clinic input]
Expand Down
3 changes: 1 addition & 2 deletions Modules/syslogmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ syslog_syslog_impl(PyObject *module, int group_left_1, int priority,
/* Incref ident, because it can be decrefed if syslog.openlog() is
* called when the GIL is released.
*/
PyObject *ident = S_ident_o;
Py_XINCREF(ident);
PyObject *ident = Py_XNewRef(S_ident_o);
#ifdef __APPLE__
// gh-98178: On macOS, libc syslog() is not thread-safe
syslog(priority, "%s", message);
Expand Down
12 changes: 4 additions & 8 deletions Objects/bytearrayobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@ bytearray_iconcat(PyByteArrayObject *self, PyObject *other)
}
memcpy(PyByteArray_AS_STRING(self) + size, vo.buf, vo.len);
PyBuffer_Release(&vo);
Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}

static PyObject *
Expand All @@ -340,8 +339,7 @@ bytearray_irepeat(PyByteArrayObject *self, Py_ssize_t count)
if (count < 0)
count = 0;
else if (count == 1) {
Py_INCREF(self);
return (PyObject*)self;
return Py_NewRef(self);
}

const Py_ssize_t mysize = Py_SIZE(self);
Expand All @@ -354,8 +352,7 @@ bytearray_irepeat(PyByteArrayObject *self, Py_ssize_t count)
char* buf = PyByteArray_AS_STRING(self);
_PyBytes_Repeat(buf, size, buf, mysize);

Py_INCREF(self);
return (PyObject *)self;
return Py_NewRef(self);
}

static PyObject *
Expand Down Expand Up @@ -2477,8 +2474,7 @@ bytearray_iter(PyObject *seq)
if (it == NULL)
return NULL;
it->it_index = 0;
Py_INCREF(seq);
it->it_seq = (PyByteArrayObject *)seq;
it->it_seq = (PyByteArrayObject *)Py_NewRef(seq);
_PyObject_GC_TRACK(it);
return (PyObject *)it;
}
3 changes: 1 addition & 2 deletions Objects/funcobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname

PyThreadState *tstate = _PyThreadState_GET();

PyCodeObject *code_obj = (PyCodeObject *)code;
Py_INCREF(code_obj);
PyCodeObject *code_obj = (PyCodeObject *)Py_NewRef(code);

PyObject *name = code_obj->co_name;
assert(name != NULL);
Expand Down
9 changes: 3 additions & 6 deletions Objects/setobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1601,8 +1601,7 @@ set_isub(PySetObject *so, PyObject *other)
Py_RETURN_NOTIMPLEMENTED;
if (set_difference_update_internal(so, other))
return NULL;
Py_INCREF(so);
return (PyObject *)so;
return Py_NewRef(so);
}

static PyObject *
Expand Down Expand Up @@ -1639,8 +1638,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
}

if (PyAnySet_Check(other)) {
Py_INCREF(other);
otherset = (PySetObject *)other;
otherset = (PySetObject *)Py_NewRef(other);
} else {
otherset = (PySetObject *)make_new_set_basetype(Py_TYPE(so), other);
if (otherset == NULL)
Expand Down Expand Up @@ -1715,8 +1713,7 @@ set_ixor(PySetObject *so, PyObject *other)
if (result == NULL)
return NULL;
Py_DECREF(result);
Py_INCREF(so);
return (PyObject *)so;
return Py_NewRef(so);
}

static PyObject *
Expand Down