diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2021-08-18 17:20:40 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2021-08-18 18:34:31 +0200 |
| commit | bb04a03c6f9bacc890118b9e12b657503093c2f8 (patch) | |
| tree | 0eb16ff89e7b6005794c516beaf4791824bcc165 | |
| parent | 640df4ef815aa35fedf1d724ab31d8eed8817f82 (diff) | |
| download | gcc-bb04a03c6f9bacc890118b9e12b657503093c2f8.zip gcc-bb04a03c6f9bacc890118b9e12b657503093c2f8.tar.gz gcc-bb04a03c6f9bacc890118b9e12b657503093c2f8.tar.bz2 | |
Make 'gcc/hash-map-tests.c:test_map_of_type_with_ctor_and_dtor_expand' work on 32-bit architectures [PR101959]
Bug fix for recent commit e4f16e9f357a38ec702fb69a0ffab9d292a6af9b
"Add more self-tests for 'hash_map' with Value type with non-trivial
constructor/destructor".
gcc/
PR bootstrap/101959
* hash-map-tests.c (test_map_of_type_with_ctor_and_dtor_expand):
Use an 'int_hash'.
| -rw-r--r-- | gcc/hash-map-tests.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gcc/hash-map-tests.c b/gcc/hash-map-tests.c index 257f2be..6acc0d4 100644 --- a/gcc/hash-map-tests.c +++ b/gcc/hash-map-tests.c @@ -328,11 +328,22 @@ test_map_of_type_with_ctor_and_dtor_expand (bool remove_some_inline) size_t expand_c_expected = 4; size_t expand_c = 0; - void *a[N_elem]; + /* For stability of this testing, we need all Key values 'k' to produce + unique hash values 'Traits::hash (k)', as otherwise the dynamic + insert/remove behavior may diverge across different architectures. This + is, for example, a problem when using the standard 'pointer_hash::hash', + which is simply doing a 'k >> 3' operation, which is fine on 64-bit + architectures, but on 32-bit architectures produces the same hash value + for subsequent 'a[i] = &a[i]' array elements. Therefore, use an + 'int_hash'. */ + + int a[N_elem]; for (size_t i = 0; i < N_elem; ++i) - a[i] = &a[i]; + a[i] = i; - typedef hash_map <void *, val_t> Map; + const int EMPTY = -1; + const int DELETED = -2; + typedef hash_map<int_hash<int, EMPTY, DELETED>, val_t> Map; /* Note that we are starting with a fresh 'Map'. Even if an existing one has been cleared out completely, there remain 'deleted' elements, and these |