public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: Marek Polacek <polacek@redhat.com>,
	GCC Patches <gcc-patches@gcc.gnu.org>,
	Joseph Myers <joseph@codesourcery.com>
Subject: Re: [PATCH] c-family: ICE with [[gnu::nocf_check]] [PR106937]
Date: Fri, 30 Sep 2022 09:12:24 -0400	[thread overview]
Message-ID: <1c85a5bf-82dd-772c-a960-75a495ded832@redhat.com> (raw)
In-Reply-To: <20220929224945.90798-1-polacek@redhat.com>

On 9/29/22 18:49, Marek Polacek wrote:
> When getting the name of an attribute, we ought to use
> get_attribute_name, which handles both [[ ]] and __attribute__(())
> forms.  Failure to do so may result in an ICE, like here.
> 
> Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?

How do we print the attributes with this patch?  Don't we also want to 
print the namespace, and use [[]] in the output?

> 	PR c++/106937
> 
> gcc/c-family/ChangeLog:
> 
> 	* c-pretty-print.cc (pp_c_attributes): Use get_attribute_name.
> 	(pp_c_attributes_display): Likewise.
> 
> gcc/testsuite/ChangeLog:
> 
> 	* gcc.dg/fcf-protection-1.c: New test.
> ---
>   gcc/c-family/c-pretty-print.cc          |  8 ++++----
>   gcc/testsuite/gcc.dg/fcf-protection-1.c | 13 +++++++++++++
>   2 files changed, 17 insertions(+), 4 deletions(-)
>   create mode 100644 gcc/testsuite/gcc.dg/fcf-protection-1.c
> 
> diff --git a/gcc/c-family/c-pretty-print.cc b/gcc/c-family/c-pretty-print.cc
> index efa1768f4d6..91f88b830e3 100644
> --- a/gcc/c-family/c-pretty-print.cc
> +++ b/gcc/c-family/c-pretty-print.cc
> @@ -863,7 +863,7 @@ pp_c_attributes (c_pretty_printer *pp, tree attributes)
>     pp_c_left_paren (pp);
>     for (; attributes != NULL_TREE; attributes = TREE_CHAIN (attributes))
>       {
> -      pp_tree_identifier (pp, TREE_PURPOSE (attributes));
> +      pp_tree_identifier (pp, get_attribute_name (attributes));
>         if (TREE_VALUE (attributes))
>   	pp_c_call_argument_list (pp, TREE_VALUE (attributes));
>   
> @@ -875,7 +875,7 @@ pp_c_attributes (c_pretty_printer *pp, tree attributes)
>   }
>   
>   /* Pretty-print ATTRIBUTES using GNU C extension syntax for attributes
> -   marked to be displayed on disgnostic.  */
> +   marked to be displayed on diagnostic.  */
>   
>   void
>   pp_c_attributes_display (c_pretty_printer *pp, tree a)
> @@ -888,7 +888,7 @@ pp_c_attributes_display (c_pretty_printer *pp, tree a)
>     for (; a != NULL_TREE; a = TREE_CHAIN (a))
>       {
>         const struct attribute_spec *as;
> -      as = lookup_attribute_spec (TREE_PURPOSE (a));
> +      as = lookup_attribute_spec (get_attribute_name (a));
>         if (!as || as->affects_type_identity == false)
>           continue;
>         if (c_dialect_cxx ()
> @@ -906,7 +906,7 @@ pp_c_attributes_display (c_pretty_printer *pp, tree a)
>          {
>            pp_separate_with (pp, ',');
>          }
> -      pp_tree_identifier (pp, TREE_PURPOSE (a));
> +      pp_tree_identifier (pp, get_attribute_name (a));
>         if (TREE_VALUE (a))
>          pp_c_call_argument_list (pp, TREE_VALUE (a));
>       }
> diff --git a/gcc/testsuite/gcc.dg/fcf-protection-1.c b/gcc/testsuite/gcc.dg/fcf-protection-1.c
> new file mode 100644
> index 00000000000..9d06feadfd1
> --- /dev/null
> +++ b/gcc/testsuite/gcc.dg/fcf-protection-1.c
> @@ -0,0 +1,13 @@
> +/* PR c++/106937 */
> +/* { dg-options "-fcf-protection -w" } */
> +
> +[[gnu::nocf_check]] typedef void (*FuncPointerWithNoCfCheck)(void);
> +typedef void (*FuncPointer)(void);
> +[[gnu::nocf_check]] void testNoCfCheck();
> +void testNoCfCheck(){};
> +int [[gnu::nocf_check]] i;
> +void testNoCfCheckImpl(double i [[gnu::nocf_check]]) {}
> +void testNoCfCheckMismatch(FuncPointer f) {
> +  FuncPointerWithNoCfCheck fNoCfCheck = f;
> +  (*fNoCfCheck)();
> +}
> 
> base-commit: c2ee70f20de8133a88553270073226b0f3f55f62


  reply	other threads:[~2022-09-30 13:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-29 22:49 Marek Polacek
2022-09-30 13:12 ` Jason Merrill [this message]
2022-10-04 23:06   ` [PATCH v2] " Marek Polacek
2022-10-06 21:42     ` Jason Merrill
2022-10-07  2:12       ` [PATCH v3] " Marek Polacek
2022-10-07 16:17         ` Jason Merrill
2022-10-07 21:08           ` [PATCH v4] " Marek Polacek
2022-10-07 21:56             ` Jason Merrill
2022-10-07 22:16               ` Marek Polacek
2022-10-10 14:49                 ` Jason Merrill
2022-10-10 19:18                   ` [PATCH v5] " Marek Polacek
2022-10-10 19:23                     ` Jason Merrill
2022-10-11  7:40                     ` Andreas Schwab
2022-10-11 20:03                       ` Marek Polacek

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=1c85a5bf-82dd-772c-a960-75a495ded832@redhat.com \
    --to=jason@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=joseph@codesourcery.com \
    --cc=polacek@redhat.com \
    /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).