public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/aoliva/heads/testme)] hash set: reject attempts to insert null pointers
Date: Fri, 23 Dec 2022 07:31:07 +0000 (GMT)	[thread overview]
Message-ID: <20221223073107.58166385B504@sourceware.org> (raw)

https://gcc.gnu.org/g:3634f8ee967c3adb60efc759f9aca885b83ba2bc

commit 3634f8ee967c3adb60efc759f9aca885b83ba2bc
Author: Alexandre Oliva <oliva@gnu.org>
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);
 		}
 	    }

             reply	other threads:[~2022-12-23  7:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-23  7:31 Alexandre Oliva [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-23  5:27 Alexandre Oliva
2022-12-23  0:58 Alexandre Oliva

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221223073107.58166385B504@sourceware.org \
    --to=aoliva@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).