From 49070d06708a8d8ae3af767f89ac40c4c12dca7b Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Mon, 9 Dec 2019 20:54:11 +0000 Subject: PR middle-end/92761 - hash_table::expand invokes assignment on invalid objects PR middle-end/92761 - hash_table::expand invokes assignment on invalid objects PR middle-end/92762 - hash_table::empty_slow invokes assignment on invalid objects gcc/ChangeLog: PR middle-end/92761 PR middle-end/92762 * hash-map-tests.c (test_map_of_type_with_ctor_and_dtor): Tighten up tests. * hash-table.h (hash_table::expand): Use placement new to copy construct objects in uninitialized storage. (hash_table::empty_slow): Avoid invoking copy assignment on uninitialized objects. From-SVN: r279139 --- gcc/hash-table.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gcc/hash-table.h') diff --git a/gcc/hash-table.h b/gcc/hash-table.h index ba5d64f..26bac62 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -818,8 +818,7 @@ hash_table::expand () if (!is_empty (x) && !is_deleted (x)) { value_type *q = find_empty_slot_for_expand (Descriptor::hash (x)); - - *q = x; + new ((void*) q) value_type (x); } p++; @@ -869,14 +868,8 @@ hash_table::empty_slow () m_size_prime_index = nindex; } else - { -#ifndef BROKEN_VALUE_INITIALIZATION - for ( ; size; ++entries, --size) - *entries = value_type (); -#else - memset (entries, 0, size * sizeof (value_type)); -#endif - } + memset ((void *) entries, 0, size * sizeof (value_type)); + m_n_deleted = 0; m_n_elements = 0; } -- cgit v1.1