Speed dictresize by collapsing its two passes into one; the reason given

in the comments for using two passes was bogus, as the only object that
can get decref'ed due to the copy is the dummy key, and decref'ing dummy
can't have side effects (for one thing, dummy is immortal!  for another,
it's a string object, not a potentially dangerous user-defined object).

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index b0121ed650655593d8c0756cf532d8f5d8152cad..b465a219efa032e0e7fdf59b22f2572e92617f3f 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -396,16 +396,17 @@ dictresize(dictobject *mp, int minused)
        mp->ma_fill = 0;
        mp->ma_used = 0;
 
-       /* Make two passes, so we can avoid decrefs
-          (and possible side effects) till the table is copied */
+       /* Copy the data over; this is refcount-neutral for active entries;
+          dummy entries aren't copied over, of course */
        for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
-               if (ep->me_value != NULL)
-                       insertdict(mp,ep->me_key,ep->me_hash,ep->me_value);
-       }
-       for (i = 0, ep = oldtable; i < oldsize; i++, ep++) {
-               if (ep->me_value == NULL) {
-                       Py_XDECREF(ep->me_key);
+               if (ep->me_value != NULL)       /* active entry */
+                       insertdict(mp, ep->me_key, ep->me_hash, ep->me_value);
+
+               else if (ep->me_key != NULL) {  /* dummy entry */
+                       assert(ep->me_key == dummy);
+                       Py_DECREF(ep->me_key);
                }
+               /* else key == value == NULL:  nothing to do */
        }
 
        if (oldtable != NULL)