mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 14:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #24681: Move the store of so->table to the code block where it is used.

Browse source
This commit is contained in:
Raymond Hettinger 2015-07-23 07:42:23 -04:00
parent 6d35043e49
commit 70559b5c20
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/setobject.c
View file

@ -50,7 +50,7 @@ static PyObject _dummy_struct;
static setentry * static setentry *
set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
{ {
setentry *table = so->table; setentry *table;
setentry *entry; setentry *entry;
size_t perturb; size_t perturb;
size_t mask = so->mask; size_t mask = so->mask;
@ -58,7 +58,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
size_t j; size_t j;
int cmp; int cmp;
entry = &table[i]; entry = &so->table[i];
if (entry->key == NULL) if (entry->key == NULL)
return entry; return entry;
@ -75,6 +75,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
&& PyUnicode_CheckExact(key) && PyUnicode_CheckExact(key)
&& _PyUnicode_EQ(startkey, key)) && _PyUnicode_EQ(startkey, key))
return entry; return entry;
table = so->table;
Py_INCREF(startkey); Py_INCREF(startkey);
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Py_DECREF(startkey); Py_DECREF(startkey);
@ -101,6 +102,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
&& PyUnicode_CheckExact(key) && PyUnicode_CheckExact(key)
&& _PyUnicode_EQ(startkey, key)) && _PyUnicode_EQ(startkey, key))
return entry; return entry;
table = so->table;
Py_INCREF(startkey); Py_INCREF(startkey);
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Py_DECREF(startkey); Py_DECREF(startkey);
@ -118,7 +120,7 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
perturb >>= PERTURB_SHIFT; perturb >>= PERTURB_SHIFT;
i = (i * 5 + 1 + perturb) & mask; i = (i * 5 + 1 + perturb) & mask;
entry = &table[i]; entry = &so->table[i];
if (entry->key == NULL) if (entry->key == NULL)
return entry; return entry;
} }
@ -144,11 +146,10 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
restart: restart:
table = so->table;
mask = so->mask; mask = so->mask;
i = (size_t)hash & mask; i = (size_t)hash & mask;
entry = &table[i]; entry = &so->table[i];
if (entry->key == NULL) if (entry->key == NULL)
goto found_unused; goto found_unused;
@ -166,6 +167,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
&& PyUnicode_CheckExact(key) && PyUnicode_CheckExact(key)
&& _PyUnicode_EQ(startkey, key)) && _PyUnicode_EQ(startkey, key))
goto found_active; goto found_active;
table = so->table;
Py_INCREF(startkey); Py_INCREF(startkey);
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Py_DECREF(startkey); Py_DECREF(startkey);
@ -177,7 +179,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
goto found_active; goto found_active;
mask = so->mask; /* help avoid a register spill */ mask = so->mask; /* help avoid a register spill */
} }
if (entry->hash == -1 && freeslot == NULL) else if (entry->hash == -1 && freeslot == NULL)
freeslot = entry; freeslot = entry;
if (i + LINEAR_PROBES <= mask) { if (i + LINEAR_PROBES <= mask) {
@ -194,6 +196,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
&& PyUnicode_CheckExact(key) && PyUnicode_CheckExact(key)
&& _PyUnicode_EQ(startkey, key)) && _PyUnicode_EQ(startkey, key))
goto found_active; goto found_active;
table = so->table;
Py_INCREF(startkey); Py_INCREF(startkey);
cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ);
Py_DECREF(startkey); Py_DECREF(startkey);
@ -213,7 +216,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
perturb >>= PERTURB_SHIFT; perturb >>= PERTURB_SHIFT;
i = (i * 5 + 1 + perturb) & mask; i = (i * 5 + 1 + perturb) & mask;
entry = &table[i]; entry = &so->table[i];
if (entry->key == NULL) if (entry->key == NULL)
goto found_unused_or_dummy; goto found_unused_or_dummy;
} }