diff options
author | Elvis Pranskevichus <elvis@edgedb.com> | 2021-08-04 19:25:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-04 19:25:44 -0700 |
commit | fa355239e70411179c70b16ed4ff7113d8008dad (patch) | |
tree | 776efefb6e20a2ef53a903172032250f86acb5d6 /tests | |
parent | 3f8cb24cf3da3af1b86ef61cefc091784d39ec08 (diff) | |
download | immutables-fa355239e70411179c70b16ed4ff7113d8008dad.tar.gz immutables-fa355239e70411179c70b16ed4ff7113d8008dad.zip |
Fix test_none_collisions on 32-bit systems (#69)
There are two issues at play here:
1. Python version of `map_hash` unnecessarily performs hash truncation
even if the hash is already 32-bit wide, which potentially converts
it from signed int to unsigned long.
2. The `test_none_collisions` test generates a collision node with
hash greater than 2^32.
Both of these are problematic on 32-bit systems, where `sizeof(Py_hash_t)`
is 4, and so anything that doesn't fit into `Py_hash_t` gets bit-mangled,
breaking the `hash(x) != x` invariance that the test relies upon.
Fixes: #53
Fixes: #50
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_none_keys.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/test_none_keys.py b/tests/test_none_keys.py index 8c0bb37..26d4220 100644 --- a/tests/test_none_keys.py +++ b/tests/test_none_keys.py @@ -1,3 +1,4 @@ +import ctypes import unittest from immutables.map import map_hash, map_mask, Map as PyMap @@ -6,16 +7,19 @@ from immutables._testutils import HashKey none_hash = map_hash(None) assert(none_hash != 1) -assert((none_hash >> 32) == 0) +assert(none_hash.bit_length() <= 32) -not_collision = 0xffffffff & (~none_hash) +none_hash_u = ctypes.c_size_t(none_hash).value +not_collision = 0xffffffff & (~none_hash_u) mask = 0x7ffffffff -none_collisions = [none_hash & (mask >> shift) +none_collisions = [none_hash_u & (mask >> shift) for shift in reversed(range(0, 32, 5))] assert(len(none_collisions) == 7) -none_collisions = [h | (not_collision & (mask << shift)) - for shift, h in zip(range(5, 37, 5), none_collisions)] +none_collisions = [ + ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value + for shift, h in zip(range(5, 37, 5), none_collisions) +] class NoneCollision(HashKey): |