Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Raymond Hettinger 2015-01-18 16:06:18 -08:00
parent b53f0fbf96
commit 9cd6a789c6
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/setobject.c
View File

@ -658,7 +658,8 @@ set_contains_key(PySetObject *so, PyObject *key)
static PyObject * static PyObject *
set_pop(PySetObject *so) 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; setentry *entry;
PyObject *key; PyObject *key;
@ -668,17 +669,9 @@ set_pop(PySetObject *so)
return NULL; 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) { while ((entry = &so->table[i])->key == NULL || entry->key==dummy) {
i++; i++;
if (i > so->mask) i &= so->mask;
i = 0;
} }
key = entry->key; key = entry->key;
entry->key = dummy; entry->key = dummy;