From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 06CEF3858D33; Wed, 1 Feb 2023 14:18:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 06CEF3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675261114; bh=Hq6MFAA8MYr4ntI8HKGQt1kUSAHSuG/n33Qns6fNuUk=; h=From:To:Subject:Date:From; b=PvKne7+TeezArf5unTVUc+Nkapwq9quccTDuw+LzXxMc7e3ypFajfULYMaKauy/+R EsdpK02qW5ExktJf2eGhpe+7SpY01hy6ICIdhsSg1rIoOzmF2YqtsRmeAefA7bLtTE vfRPYMaSGn/ISI9vHeKr4pPFttc46EdRwboH5294= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5629] ipa: check if cache_token != NULL before hash_set::add call X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: bf2cf6f3f1851054237ee7df99bdf60bf5a3e3ae X-Git-Newrev: 78589691ee158e689fa9bb7dec1165da475ea634 Message-Id: <20230201141834.06CEF3858D33@sourceware.org> Date: Wed, 1 Feb 2023 14:18:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:78589691ee158e689fa9bb7dec1165da475ea634 commit r13-5629-g78589691ee158e689fa9bb7dec1165da475ea634 Author: Martin Liska Date: Tue Jan 24 14:39:11 2023 +0100 ipa: check if cache_token != NULL before hash_set::add call We should not insert an empty value to the container. PR ipa/108509 gcc/ChangeLog: * cgraphunit.cc (walk_polymorphic_call_targets): Insert ony non-null values. * ipa.cc (walk_polymorphic_call_targets): Likewise. gcc/testsuite/ChangeLog: * g++.dg/ipa/pr108509.C: New test. Diff: --- gcc/cgraphunit.cc | 2 +- gcc/ipa.cc | 2 +- gcc/testsuite/g++.dg/ipa/pr108509.C | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc index 832818d651f..a972900900b 100644 --- a/gcc/cgraphunit.cc +++ b/gcc/cgraphunit.cc @@ -1000,7 +1000,7 @@ walk_polymorphic_call_targets (hash_set *reachable_call_targets, = possible_polymorphic_call_targets (edge, &final, &cache_token); - if (!reachable_call_targets->add (cache_token)) + if (cache_token != NULL && !reachable_call_targets->add (cache_token)) { if (symtab->dump_file) dump_possible_polymorphic_call_targets diff --git a/gcc/ipa.cc b/gcc/ipa.cc index 4de605000b6..5c15b60a603 100644 --- a/gcc/ipa.cc +++ b/gcc/ipa.cc @@ -182,7 +182,7 @@ walk_polymorphic_call_targets (hash_set *reachable_call_targets, = possible_polymorphic_call_targets (edge, &final, &cache_token); - if (!reachable_call_targets->add (cache_token)) + if (cache_token != NULL && !reachable_call_targets->add (cache_token)) { for (i = 0; i < targets.length (); i++) { diff --git a/gcc/testsuite/g++.dg/ipa/pr108509.C b/gcc/testsuite/g++.dg/ipa/pr108509.C new file mode 100644 index 00000000000..2844189bbb4 --- /dev/null +++ b/gcc/testsuite/g++.dg/ipa/pr108509.C @@ -0,0 +1,22 @@ +// PR ipa/108509 +// { dg-do compile } +// { dg-options "-O1 -fdevirtualize -fno-tree-fre" } + +struct B { + virtual void deref (); +}; + +struct RefPtr { + B *p; + + RefPtr () + { + p->deref (); + } +}; + +void +f () +{ + RefPtr b; +}