Clean up

Author: matthiasgoergens

Modules/_collectionsmodule.c

@@ -2012,7 +2012,7 @@ dequeiter_len(PyObject *op, PyObject *Py_UNUSED(dummy))
     return PyLong_FromSsize_t(remaining);
 }
 
-PyDoc_STRVAR(dequeiter_len_doc, "Private method returning an estimate of len(list(it)).");
+PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
 
 static PyObject *
 dequeiter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
@@ -2030,12 +2030,11 @@ dequeiter_reduce(PyObject *op, PyObject *Py_UNUSED(dummy))
 }
 
 static PyMethodDef dequeiter_methods[] = {
-    {"__length_hint__", dequeiter_len, METH_NOARGS, dequeiter_len_doc},
+    {"__length_hint__", dequeiter_len, METH_NOARGS, length_hint_doc},
     {"__reduce__", dequeiter_reduce, METH_NOARGS, reduce_doc},
     {NULL,              NULL}           /* sentinel */
 };
 
-
 static PyType_Slot dequeiter_slots[] = {
     {Py_tp_dealloc, dequeiter_dealloc},
     {Py_tp_getattro, PyObject_GenericGetAttr},
@@ -2102,16 +2101,17 @@ dequereviter_next_lock_held(dequeiterobject *it, dequeobject *deque)
 }
 
 static PyObject *
-dequereviter_next(PyObject *self)
+dequeiter_next(PyObject *op)
 {
     PyObject *result;
-    dequeiterobject *it = dequeiterobject_CAST(self);
-    Py_BEGIN_CRITICAL_SECTION2(it, it->deque);
-    result = dequereviter_next_lock_held(it, it->deque);
+    dequeiterobject *it = dequeiterobject_CAST(op);
+    // It's safe to access it->deque without holding the per-object lock for it
+    // here; it->deque is only assigned during construction of it.
+    dequeobject *deque = it->deque;
+    Py_BEGIN_CRITICAL_SECTION2(it, deque);
+    result = dequeiter_next_lock_held(it, deque);
     Py_END_CRITICAL_SECTION2();
-    // if (result == NULL) {
-    //     Py_DECREF(it);
-    // }
+
     return result;
 }