From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 16 Jan 2018 10:27:15 +0000 (-0800)
Subject: bpo-26163: Frozenset hash improvement (GH-5194) (#5198)
X-Git-Tag: v3.6.5rc1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7dbd0658304f11daf103d56662656efecad006d;p=python

bpo-26163: Frozenset hash improvement (GH-5194) (#5198)

(cherry picked from commit b44c5169f64178d2ff2914187b315549e7ab0cb6)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-01-14-20-32-47.bpo-26163.xv9Iuv.rst b/Misc/NEWS.d/next/Core and Builtins/2018-01-14-20-32-47.bpo-26163.xv9Iuv.rst
new file mode 100644
index 0000000000..163b9e02c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-01-14-20-32-47.bpo-26163.xv9Iuv.rst	
@@ -0,0 +1,2 @@
+Improved frozenset() hash to create more distinct hash values when faced
+with datasets containing many similar values.
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 24272b4d14..093a15f367 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -790,6 +790,7 @@ frozenset_hash(PyObject *self)
     hash ^= ((Py_uhash_t)PySet_GET_SIZE(self) + 1) * 1927868237UL;
 
     /* Disperse patterns arising in nested frozensets */
+    hash ^= (hash >> 11) ^ (~hash >> 25);
     hash = hash * 69069U + 907133923UL;
 
     /* -1 is reserved as an error code */