public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-5436] cgraph: Adjust verify_corresponds_to_fndecl [PR106061]
Date: Fri, 27 Jan 2023 10:17:18 +0000 (GMT)	[thread overview]
Message-ID: <20230127101718.E5E5E3858C60@sourceware.org> (raw)

https://gcc.gnu.org/g:bd246ac68239d944b01c213c39d6e212362c1b40

commit r13-5436-gbd246ac68239d944b01c213c39d6e212362c1b40
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Jan 27 11:16:43 2023 +0100

    cgraph: Adjust verify_corresponds_to_fndecl [PR106061]
    
    IPA passes redirect some calls in what it determines to be unreachable code
    to builtin_decl_unreachable.  But that function returns sometimes
    builtin_decl_explicit (BUILT_IN_UNREACHABLE) (which was what GCC 12
    and earlier did always), or builtin_decl_explicit (BUILT_IN_TRAP)
    (e.g. for -funreachable-traps, -O0, -Og).
    Now the cgraph verification code has a code to verify cgraph edges
    and has there an exception for these redirections to BUILT_IN_UNREACHABLE,
    but doesn't have for BUILT_IN_TRAP, so e.g. the following testcase
    ICEs during that verification.
    
    The following patch just adds BUILT_IN_TRAP to those exceptions.
    
    2023-01-27  Jakub Jelinek  <jakub@redhat.com>
    
            PR ipa/106061
            * cgraph.cc (cgraph_edge::verify_corresponds_to_fndecl): Allow
            redirection of calls to __builtin_trap in addition to redirection
            to __builtin_unreachable.
    
            * gcc.dg/pr106061.c: New test.

Diff:
---
 gcc/cgraph.cc                   |  6 ++++--
 gcc/testsuite/gcc.dg/pr106061.c | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gcc/cgraph.cc b/gcc/cgraph.cc
index 5f72ace9b57..b810237c919 100644
--- a/gcc/cgraph.cc
+++ b/gcc/cgraph.cc
@@ -3248,9 +3248,11 @@ cgraph_edge::verify_corresponds_to_fndecl (tree decl)
   node = node->ultimate_alias_target ();
 
   /* Optimizers can redirect unreachable calls or calls triggering undefined
-     behavior to builtin_unreachable.  */
+     behavior to __builtin_unreachable or __builtin_trap.  */
 
-  if (fndecl_built_in_p (callee->decl, BUILT_IN_UNREACHABLE))
+  if (fndecl_built_in_p (callee->decl, BUILT_IN_NORMAL)
+      && (DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE
+	  || DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_TRAP))
     return false;
 
   if (callee->former_clone_of != node->decl
diff --git a/gcc/testsuite/gcc.dg/pr106061.c b/gcc/testsuite/gcc.dg/pr106061.c
new file mode 100644
index 00000000000..bba8d29bf47
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr106061.c
@@ -0,0 +1,18 @@
+/* PR ipa/106061 */
+/* { dg-do compile } */
+/* { dg-options "-Og" } */
+
+extern void foo (void);
+
+inline void
+bar (int x)
+{
+  if (x)
+    foo ();
+}
+
+void
+baz (void)
+{
+  bar (0);
+}

                 reply	other threads:[~2023-01-27 10:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20230127101718.E5E5E3858C60@sourceware.org \
    --to=jakub@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).