From 14593e19e199dd34f268b35987ddb288bf022039 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 2 Feb 2017 08:24:48 -0800 Subject: Remove unnecessary variables. * so->used never gets changed during a resize * so->filled only changes when dummies are present and being eliminated --- Objects/setobject.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c index 59ed7955e6..c72c0fae62 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -296,8 +296,6 @@ set_table_resize(PySetObject *so, Py_ssize_t minused) { Py_ssize_t newsize; setentry *oldtable, *newtable, *entry; - Py_ssize_t oldfill = so->fill; - Py_ssize_t oldused = so->used; Py_ssize_t oldmask = so->mask; size_t newmask; int is_oldtable_malloced; @@ -352,21 +350,20 @@ set_table_resize(PySetObject *so, Py_ssize_t minused) /* Make the set empty, using the new table. */ assert(newtable != oldtable); memset(newtable, 0, sizeof(setentry) * newsize); - so->fill = oldused; - so->used = oldused; so->mask = newsize - 1; so->table = newtable; /* Copy the data over; this is refcount-neutral for active entries; dummy entries aren't copied over, of course */ newmask = (size_t)so->mask; - if (oldfill == oldused) { + if (so->fill == so->used) { for (entry = oldtable; entry <= oldtable + oldmask; entry++) { if (entry->key != NULL) { set_insert_clean(newtable, newmask, entry->key, entry->hash); } } } else { + so->fill = so->used; for (entry = oldtable; entry <= oldtable + oldmask; entry++) { if (entry->key != NULL && entry->key != dummy) { set_insert_clean(newtable, newmask, entry->key, entry->hash); -- cgit v1.2.1