From: Raymond Hettinger <python@rcn.com>
Date: Thu, 2 Feb 2017 16:24:48 +0000 (-0800)
Subject: Remove unnecessary variables.
X-Git-Tag: v3.7.0a1~1432
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1af6964b48671e3ac47ee60688a1b74fa272845;p=thirdparty%2FPython%2Fcpython.git

Remove unnecessary variables.
* so->used never gets changed during a resize
* so->filled only changes when dummies are present and being eliminated
---

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 59ed7955e6ad..c72c0fae62aa 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);