Move the active entry multiplication to later in the hash calculation
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 0a065cc..03bb230 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -760,15 +760,12 @@
frozenset_hash(PyObject *self)
{
PySetObject *so = (PySetObject *)self;
- Py_uhash_t hash = 1927868237UL;
+ Py_uhash_t hash = 0;
setentry *entry;
if (so->hash != -1)
return so->hash;
- /* Initial dispersion based on the number of active entries */
- hash *= (Py_uhash_t)PySet_GET_SIZE(self) + 1;
-
/* Xor-in shuffled bits from every entry's hash field because xor is
commutative and a frozenset hash should be independent of order.
@@ -790,6 +787,9 @@
if ((so->fill - so->used) & 1)
hash ^= _shuffle_bits(-1);
+ /* Factor in the number of active entries */
+ hash ^= ((Py_uhash_t)PySet_GET_SIZE(self) + 1) * 1927868237UL;
+
/* Disperse patterns arising in nested frozensets */
hash = hash * 69069U + 907133923UL;