mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

make hashes always the size of pointers; introduce Py_hash_t #9778

Browse source
This commit is contained in:
Benjamin Peterson 2010-10-17 20:54:53 +00:00
parent 6fb457526c
commit 8f67d0893f
31 changed files with 137 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/object.c
View file

@ -687,7 +687,7 @@ PyObject_RichCompareBool(PyObject *v, PyObject *w, int op)
*/
long
Py_hash_t
_Py_HashDouble(double v)
{
int e, sign;
@ -730,24 +730,24 @@ _Py_HashDouble(double v)
x = x * sign;
if (x == (unsigned long)-1)
x = (unsigned long)-2;
return (long)x;
return (Py_hash_t)x;
}
long
Py_hash_t
_Py_HashPointer(void *p)
{
long x;
Py_hash_t x;
size_t y = (size_t)p;
/* bottom 3 or 4 bits are likely to be 0; rotate y by 4 to avoid
excessive hash collisions for dicts and sets */
y = (y >> 4) | (y << (8 * SIZEOF_VOID_P - 4));
x = (long)y;
x = (Py_hash_t)y;
if (x == -1)
x = -2;
return x;
}
long
Py_hash_t
PyObject_HashNotImplemented(PyObject *v)
{
PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
@ -755,7 +755,7 @@ PyObject_HashNotImplemented(PyObject *v)
return -1;
}
long
Py_hash_t
PyObject_Hash(PyObject *v)
{
PyTypeObject *tp = Py_TYPE(v);