From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 3F63F3858D20; Thu, 12 Jan 2023 03:34:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F63F3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673494467; bh=1JOTpGBeZHhCOPJUbr4EJc+jh6CVhrwH6QLkAMpVh0Q=; h=From:To:Subject:Date:From; b=y4PQLoCr6ZvZI9MTAOl9UTUtuCYDk90kzxHRp7BvyVxVfXHg9H6W+e66M6chK3mO7 3D9cnTUVZRbCapN+LX7IJ3P+zgV/O4GuSaTyR2ub+7bCvlUlsJLADnLtrIyT9d8Yy+ 6cGk8EVMd/o4Q6qWShUpH9I8/+7KJSF3rADz+l7k= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5117] check hash table counts at expand X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/master X-Git-Oldrev: 81ed98bc57c3dbd89f26c13987119bf843a5e8f0 X-Git-Newrev: f54e3b3ba01ced7ecda3caed51b42f707d489c77 Message-Id: <20230112033427.3F63F3858D20@sourceware.org> Date: Thu, 12 Jan 2023 03:34:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f54e3b3ba01ced7ecda3caed51b42f707d489c77 commit r13-5117-gf54e3b3ba01ced7ecda3caed51b42f707d489c77 Author: Alexandre Oliva Date: Thu Jan 12 00:29:33 2023 -0300 check hash table counts at expand Add cheap verification of element and deleted entry counts during expand and hash verify. for gcc/ChangeLog * hash-table.h (expand): Check elements and deleted counts. (verify): Likewise. Diff: --- gcc/hash-table.h | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/gcc/hash-table.h b/gcc/hash-table.h index a505b1ec9af..1d3166504c3 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -849,19 +849,28 @@ hash_table::expand () hash_table_usage ().release_instance_overhead (this, sizeof (value_type) * osize); + size_t n_deleted = m_n_deleted; + m_entries = nentries; m_size = nsize; m_size_prime_index = nindex; m_n_elements -= m_n_deleted; m_n_deleted = 0; + size_t n_elements = m_n_elements; + value_type *p = oentries; do { value_type &x = *p; - if (!is_empty (x) && !is_deleted (x)) + if (is_empty (x)) + ; + else if (is_deleted (x)) + n_deleted--; + else { + n_elements--; value_type *q = find_empty_slot_for_expand (Descriptor::hash (x)); new ((void*) q) value_type (std::move (x)); /* After the resources of 'x' have been moved to a new object at 'q', @@ -873,6 +882,8 @@ hash_table::expand () } while (p < olimit); + gcc_checking_assert (!n_elements && !n_deleted); + if (!m_ggc) Allocator ::data_free (oentries); else @@ -1070,8 +1081,9 @@ hash_table return check_insert_slot (&m_entries[index]); } -/* Verify that all existing elements in th hash table which are - equal to COMPARABLE have an equal HASH value provided as argument. */ +/* Verify that all existing elements in the hash table which are + equal to COMPARABLE have an equal HASH value provided as argument. + Also check that the hash table element counts are correct. */ template class Allocator> @@ -1079,14 +1091,23 @@ void hash_table ::verify (const compare_type &comparable, hashval_t hash) { + size_t n_elements = m_n_elements; + size_t n_deleted = m_n_deleted; for (size_t i = 0; i < MIN (hash_table_sanitize_eq_limit, m_size); i++) { value_type *entry = &m_entries[i]; - if (!is_empty (*entry) && !is_deleted (*entry) - && hash != Descriptor::hash (*entry) - && Descriptor::equal (*entry, comparable)) - hashtab_chk_error (); + if (!is_empty (*entry)) + { + n_elements--; + if (is_deleted (*entry)) + n_deleted--; + else if (hash != Descriptor::hash (*entry) + && Descriptor::equal (*entry, comparable)) + hashtab_chk_error (); + } } + if (hash_table_sanitize_eq_limit >= m_size) + gcc_checking_assert (!n_elements && !n_deleted); } /* This function deletes an element with the given COMPARABLE value