From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id A365E385703F; Fri, 23 Dec 2022 05:27:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A365E385703F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671773222; bh=kSALslCU9R3zg5XrRdABTpsrLSwOIQ3Lp7xmQI73zlI=; h=From:To:Subject:Date:From; b=uAbKc1urm/Fbrb5pR30E0pbqQwQzYsSl/pIW85cYg4G408cwBTN5O5mg88z/X5PFs mcyUmShOCNvUz0l1xPHAtQ2ofTGo86oUC7XNpDWrFAvxYGl0j0IMC9o5MhVEZwQCUK SsayBHx2fSM/4UVlo3JliM3O95haiqA3WylkuZUA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] hash set: reject attempts to insert null pointers X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 08df3b23b8f36e2388ae648dde07b4b17a69fa9a X-Git-Newrev: a0ad3726dd1bed390cb8f0313d08c5e1d698c1ef Message-Id: <20221223052702.A365E385703F@sourceware.org> Date: Fri, 23 Dec 2022 05:27:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a0ad3726dd1bed390cb8f0313d08c5e1d698c1ef commit a0ad3726dd1bed390cb8f0313d08c5e1d698c1ef Author: Alexandre Oliva Date: Thu Dec 22 21:28:48 2022 -0300 hash set: reject attempts to insert null pointers Diff: --- gcc/hash-set.h | 6 +++++- gcc/varpool.cc | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/hash-set.h b/gcc/hash-set.h index 76fa7f39456..a98121a060e 100644 --- a/gcc/hash-set.h +++ b/gcc/hash-set.h @@ -58,7 +58,11 @@ public: Key *e = m_table.find_slot_with_hash (k, Traits::hash (k), INSERT); bool existed = !Traits::is_empty (*e); if (!existed) - new (e) Key (k); + { + new (e) Key (k); + // Catch attempts to insert e.g. a NULL pointer. + gcc_checking_assert (!Traits::is_empty (*e)); + } return existed; } diff --git a/gcc/varpool.cc b/gcc/varpool.cc index bfd17f1250c..ccbd6e50f4b 100644 --- a/gcc/varpool.cc +++ b/gcc/varpool.cc @@ -680,10 +680,12 @@ symbol_table::remove_unreferenced_decls (void) enqueue_node (vnode, &first); else { - referenced.add (vnode); + if (vnode) + referenced.add (vnode); while (vnode && vnode->alias && vnode->definition) { vnode = vnode->get_alias_target (); + gcc_checking_assert (vnode); referenced.add (vnode); } }