Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 18797: Remove unneeded refcount adjustments for dummy objects. 

It suffices to keep just one reference when the object is created.
This commit is contained in:
Raymond Hettinger 2013-08-22 08:20:31 -07:00
parent e39e54d0b3
commit fcf3b500ba
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/setobject.c
View File

@ -274,7 +274,6 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
entry->key = key; entry->key = key;
entry->hash = hash; entry->hash = hash;
so->used++; so->used++;
Py_DECREF(dummy);
} else { } else {
/* ACTIVE */ /* ACTIVE */
Py_DECREF(key); Py_DECREF(key);
@ -381,23 +380,15 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
so->table = newtable; so->table = newtable;
so->mask = newsize - 1; so->mask = newsize - 1;
memset(newtable, 0, sizeof(setentry) * newsize); memset(newtable, 0, sizeof(setentry) * newsize);
i = so->used;
so->used = 0; so->used = 0;
i = so->fill;
so->fill = 0; so->fill = 0;
/* Copy the data over; this is refcount-neutral for active entries; /* Copy the data over; this is refcount-neutral for active entries;
dummy entries aren't copied over, of course */ dummy entries aren't copied over, of course */
dummy_entry = dummy; dummy_entry = dummy;
for (entry = oldtable; i > 0; entry++) { for (entry = oldtable; i > 0; entry++) {
if (entry->key == NULL) { if (entry->key != NULL && entry->key != dummy_entry) {
/* UNUSED */
;
} else if (entry->key == dummy_entry) {
/* DUMMY */
--i;
assert(entry->key == dummy);
Py_DECREF(entry->key);
} else {
/* ACTIVE */ /* ACTIVE */
--i; --i;
set_insert_clean(so, entry->key, entry->hash); set_insert_clean(so, entry->key, entry->hash);
@ -468,7 +459,6 @@ set_discard_entry(PySetObject *so, setentry *oldentry)
if (entry->key == NULL || entry->key == dummy) if (entry->key == NULL || entry->key == dummy)
return DISCARD_NOTFOUND; return DISCARD_NOTFOUND;
old_key = entry->key; old_key = entry->key;
Py_INCREF(dummy);
entry->key = dummy; entry->key = dummy;
so->used--; so->used--;
Py_DECREF(old_key); Py_DECREF(old_key);
@ -496,7 +486,6 @@ set_discard_key(PySetObject *so, PyObject *key)
if (entry->key == NULL || entry->key == dummy) if (entry->key == NULL || entry->key == dummy)
return DISCARD_NOTFOUND; return DISCARD_NOTFOUND;
old_key = entry->key; old_key = entry->key;
Py_INCREF(dummy);
entry->key = dummy; entry->key = dummy;
so->used--; so->used--;
Py_DECREF(old_key); Py_DECREF(old_key);
@ -554,6 +543,7 @@ set_clear_internal(PySetObject *so)
#endif #endif
if (entry->key) { if (entry->key) {
--fill; --fill;
if (entry->key != dummy)
Py_DECREF(entry->key); Py_DECREF(entry->key);
} }
#ifdef Py_DEBUG #ifdef Py_DEBUG
@ -615,6 +605,7 @@ set_dealloc(PySetObject *so)
for (entry = so->table; fill > 0; entry++) { for (entry = so->table; fill > 0; entry++) {
if (entry->key) { if (entry->key) {
--fill; --fill;
if (entry->key != dummy)
Py_DECREF(entry->key); Py_DECREF(entry->key);
} }
} }
@ -788,7 +779,6 @@ set_pop(PySetObject *so)
} }
} }
key = entry->key; key = entry->key;
Py_INCREF(dummy);
entry->key = dummy; entry->key = dummy;
so->used--; so->used--;
so->table[0].hash = i + 1; /* next place to start */ so->table[0].hash = i + 1; /* next place to start */