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 9dc88c834ef58d814889c374c67c80726f686ffc..91f341cb0165bbe2b2b1f9698972eedfa13b73b2 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -658,7 +658,8 @@ set_contains_key(PySetObject *so, PyObject *key)
 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 @@ set_pop(PySetObject *so)
         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;