diff options
| author | Jason Merrill <jason@redhat.com> | 2019-03-14 18:47:01 -0400 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-03-14 23:47:01 +0100 |
| commit | 62de703f1990d2c4dd7ee0c41bfa886b5c589793 (patch) | |
| tree | 2a29bb29ec24c6fcd36a8c7374df0da26cd7134b /gcc | |
| parent | 12fb7712a8a20fce6f3dac80251e67251c01c209 (diff) | |
| download | gcc-62de703f1990d2c4dd7ee0c41bfa886b5c589793.zip gcc-62de703f1990d2c4dd7ee0c41bfa886b5c589793.tar.gz gcc-62de703f1990d2c4dd7ee0c41bfa886b5c589793.tar.bz2 | |
hash-table.h (remove_elt_with_hash): Return if slot is NULL rather than if is_empty (*slot).
* hash-table.h (remove_elt_with_hash): Return if slot is NULL rather
than if is_empty (*slot).
* hash-set-tests.c (test_set_of_strings): Add tests for addition of
existing elt and for elt removal.
* hash-map-tests.c (test_map_of_strings_to_int): Add test for removal
of already removed elt.
* hashtab.c (htab_remove_elt_with_hash): Return if slot is NULL rather
than if *slot is HTAB_EMPTY_ENTRY.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r269695
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/hash-map-tests.c | 4 | ||||
| -rw-r--r-- | gcc/hash-set-tests.c | 15 | ||||
| -rw-r--r-- | gcc/hash-table.h | 2 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4890c75..394271f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2019-03-14 Jason Merrill <jason@redhat.com> + Jakub Jelinek <jakub@redhat.com> + + * hash-table.h (remove_elt_with_hash): Return if slot is NULL rather + than if is_empty (*slot). + * hash-set-tests.c (test_set_of_strings): Add tests for addition of + existing elt and for elt removal. + * hash-map-tests.c (test_map_of_strings_to_int): Add test for removal + of already removed elt. + 2019-03-15 H.J. Lu <hongjiu.lu@intel.com> PR target/89650 diff --git a/gcc/hash-map-tests.c b/gcc/hash-map-tests.c index 2137464..acbfdb9 100644 --- a/gcc/hash-map-tests.c +++ b/gcc/hash-map-tests.c @@ -78,6 +78,10 @@ test_map_of_strings_to_int () ASSERT_EQ (5, m.elements ()); ASSERT_EQ (NULL, m.get (eric)); + m.remove (eric); + ASSERT_EQ (5, m.elements ()); + ASSERT_EQ (NULL, m.get (eric)); + /* A plain char * key is hashed based on its value (address), rather than the string it points to. */ char *another_ant = static_cast <char *> (xcalloc (4, 1)); diff --git a/gcc/hash-set-tests.c b/gcc/hash-set-tests.c index 5ca1e4e..f75d41a 100644 --- a/gcc/hash-set-tests.c +++ b/gcc/hash-set-tests.c @@ -48,11 +48,26 @@ test_set_of_strings () ASSERT_EQ (false, s.add (red)); ASSERT_EQ (false, s.add (green)); ASSERT_EQ (false, s.add (blue)); + ASSERT_EQ (true, s.add (green)); /* Verify that the values are now within the set. */ ASSERT_EQ (true, s.contains (red)); ASSERT_EQ (true, s.contains (green)); ASSERT_EQ (true, s.contains (blue)); + ASSERT_EQ (3, s.elements ()); + + /* Test removal. */ + s.remove (red); + ASSERT_EQ (false, s.contains (red)); + ASSERT_EQ (true, s.contains (green)); + ASSERT_EQ (true, s.contains (blue)); + ASSERT_EQ (2, s.elements ()); + + s.remove (red); + ASSERT_EQ (false, s.contains (red)); + ASSERT_EQ (true, s.contains (green)); + ASSERT_EQ (true, s.contains (blue)); + ASSERT_EQ (2, s.elements ()); } /* Run all of the selftests within this file. */ diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 1fd3694..9e09fa4 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -940,7 +940,7 @@ hash_table<Descriptor, Allocator> ::remove_elt_with_hash (const compare_type &comparable, hashval_t hash) { value_type *slot = find_slot_with_hash (comparable, hash, NO_INSERT); - if (is_empty (*slot)) + if (slot == NULL) return; Descriptor::remove (*slot); |