Skip to content

bpo-43475: Fix worst case collision behavior for NaN instances #25493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 6 commits into from
Apr 22, 2021
Merged

bpo-43475: Fix worst case collision behavior for NaN instances #25493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9cde10
bpo-43475: Fix worst case collision behavior for NaN instances
rhettinger Apr 21, 2021
20b73c3
Fix decimal and docs as well
rhettinger Apr 21, 2021
056a4f7
Add casts
rhettinger Apr 21, 2021
dc73c3c
Use existing pointer hash logic
rhettinger Apr 21, 2021
9f3f9e9
Improve comment wording
rhettinger Apr 21, 2021
6ac6975
Fix typo in comment
rhettinger Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add casts
  • Loading branch information
@rhettinger
rhettinger committed Apr 21, 2021
commit 056a4f72859d46f6588d83210f7f9d50f93c56a3
4 changes: 2 additions & 2 deletions Objects/complexobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,10 @@ static Py_hash_t
complex_hash(PyComplexObject *v)
{
Py_uhash_t hashreal, hashimag, combined;
hashreal = (Py_uhash_t)_Py_HashDouble(v, v->cval.real);
hashreal = (Py_uhash_t)_Py_HashDouble((PyObject *) v, v->cval.real);
if (hashreal == (Py_uhash_t)-1)
return -1;
hashimag = (Py_uhash_t)_Py_HashDouble(v, v->cval.imag);
hashimag = (Py_uhash_t)_Py_HashDouble((PyObject *)v, v->cval.imag);
if (hashimag == (Py_uhash_t)-1)
return -1;
/* Note: if the imaginary part is 0, hashimag is 0 now,
Expand Down
2 changes: 1 addition & 1 deletion Objects/floatobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ float_richcompare(PyObject *v, PyObject *w, int op)
static Py_hash_t
float_hash(PyFloatObject *v)
{
return _Py_HashDouble(v, v->ob_fval);
return _Py_HashDouble((PyObject *)v, v->ob_fval);
}

static PyObject *
Expand Down