From 1928314ef470e038b104162735eb3fa752ea9ba0 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Thu, 17 May 2001 22:25:34 +0000 Subject: 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). --- Objects/dictobject.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index b0121ed..b465a21 100644 --- 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) -- cgit v0.12