Commit 5bb1b1dd authored by Raymond Hettinger's avatar Raymond Hettinger

Hoist the global dummy lookup out of the inner loop for set_merge().

parent 929cbac3
...@@ -683,6 +683,7 @@ set_merge(PySetObject *so, PyObject *otherset) ...@@ -683,6 +683,7 @@ set_merge(PySetObject *so, PyObject *otherset)
{ {
PySetObject *other; PySetObject *other;
PyObject *key; PyObject *key;
PyObject *dummy_entry;
Py_hash_t hash; Py_hash_t hash;
Py_ssize_t i; Py_ssize_t i;
setentry *entry; setentry *entry;
...@@ -702,12 +703,13 @@ set_merge(PySetObject *so, PyObject *otherset) ...@@ -702,12 +703,13 @@ set_merge(PySetObject *so, PyObject *otherset)
if (set_table_resize(so, (so->used + other->used)*2) != 0) if (set_table_resize(so, (so->used + other->used)*2) != 0)
return -1; return -1;
} }
dummy_entry = dummy;
for (i = 0; i <= other->mask; i++) { for (i = 0; i <= other->mask; i++) {
entry = &other->table[i]; entry = &other->table[i];
key = entry->key; key = entry->key;
hash = entry->hash; hash = entry->hash;
if (key != NULL && if (key != NULL &&
key != dummy) { key != dummy_entry) {
Py_INCREF(key); Py_INCREF(key);
if (set_insert_key(so, key, hash) == -1) { if (set_insert_key(so, key, hash) == -1) {
Py_DECREF(key); Py_DECREF(key);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment