[Python-checkins] Simplify set entry insertion logic. (GH-19881)
Raymond Hettinger
webhook-mailer at python.org
Sun May 3 07:51:28 EDT 2020
https://github.com/python/cpython/commit/3dd2157febae5087ca3333d24f69b6de9cbd13cd
commit: 3dd2157febae5087ca3333d24f69b6de9cbd13cd
branch: master
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-05-03T04:51:05-07:00
summary:
Simplify set entry insertion logic. (GH-19881)
files:
M Objects/setobject.c
diff --git a/Objects/setobject.c b/Objects/setobject.c
index bbe013bcfac74..df4a0e1e9420e 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -137,7 +137,6 @@ static int
set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
{
setentry *table;
- setentry *freeslot;
setentry *entry;
size_t perturb;
size_t mask;
@@ -158,7 +157,6 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
if (entry->key == NULL)
goto found_unused;
- freeslot = NULL;
perturb = hash;
while (1) {
@@ -187,14 +185,12 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
goto restart;
mask = so->mask; /* help avoid a register spill */
}
- else if (entry->hash == -1)
- freeslot = entry;
if (i + LINEAR_PROBES <= mask) {
for (j = 0 ; j < LINEAR_PROBES ; j++) {
entry++;
if (entry->hash == 0 && entry->key == NULL)
- goto found_unused_or_dummy;
+ goto found_unused;
if (entry->hash == hash) {
PyObject *startkey = entry->key;
assert(startkey != dummy);
@@ -216,8 +212,6 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
goto restart;
mask = so->mask;
}
- else if (entry->hash == -1)
- freeslot = entry;
}
}
@@ -226,17 +220,9 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
entry = &so->table[i];
if (entry->key == NULL)
- goto found_unused_or_dummy;
+ goto found_unused;
}
- found_unused_or_dummy:
- if (freeslot == NULL)
- goto found_unused;
- so->used++;
- freeslot->key = key;
- freeslot->hash = hash;
- return 0;
-
found_unused:
so->fill++;
so->used++;
More information about the Python-checkins
mailing list