Clean-up, simplify, and slightly speed-up bounds logic in set_pop().
Elsewhere in the setobject.c code we do a bitwise-and with the mask
instead of using a conditional to reset to zero on wrap-around.
Using that same technique here use gives cleaner, faster, and more
consistent code.
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 9dc88c8..91f341c 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -658,7 +658,8 @@
static PyObject *
set_pop(PySetObject *so)
{
- Py_ssize_t i = 0;
+ /* Make sure the search finger is in bounds */
+ Py_ssize_t i = so->finger & so->mask;
setentry *entry;
PyObject *key;
@@ -668,17 +669,9 @@
return NULL;
}
- i = so->finger;
- /* This may be a legit search finger, or it may be a once legit
- * search finger that's out of bounds now (due to wrapping or
- * resizing). We simply make sure it's in bounds now.
- */
- if (i > so->mask)
- i = 0;
while ((entry = &so->table[i])->key == NULL || entry->key==dummy) {
i++;
- if (i > so->mask)
- i = 0;
+ i &= so->mask;
}
key = entry->key;
entry->key = dummy;