Re: [PATCH v3] c-family: ICE with [[gnu::nocf_check]] [PR106937]

Jason Merrill via Gcc-patches Fri, 07 Oct 2022 09:18:13 -0700

On 10/6/22 22:12, Marek Polacek wrote:

On Thu, Oct 06, 2022 at 05:42:41PM -0400, Jason Merrill wrote:

On 10/4/22 19:06, Marek Polacek wrote:

On Fri, Sep 30, 2022 at 09:12:24AM -0400, Jason Merrill wrote:

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?


Good point, however: while the testcase indeed has an attribute
in the [[]] form in the typedef, here we're printing its "aka":

warning: initialization of 'FuncPointerWithNoCfCheck' {aka 'void 
(__attribute__((nocf_check)) *)(void)'} from incompatible pointer type 
'FuncPointer' {aka 'void (*)(void)'}

c-pretty-print.cc doesn't seem to know how to print an [[]] attribute.
I could do that, but then we'd print

    aka 'void ([[nocf_check]] *)(void)'

in the above, but that's invalid syntax!


Indeed, it should be

void (* [[gnu::nocf_check]])(void)


Ok, let me fix that too, then.  I've updated the description to show
what we print with the patch, and what was printed before.

Oops, apparently I was wrongly assuming that the attribute appertainedto the pointer. Since it actually appertains to the function type, itshould be


     void (*)(void) [[gnu::nocf_check]].

But for GCC attribute syntax, I think we want to leave the __attribute__where it was before, as in the manual's example


     void (__attribute__((noreturn)) ****f) (void);

And I also noticed another thing: type_hash_canon_hash hashes only
get_attribute_name, so build_type_attribute_qual_variant will use the
same function_type tree for these two pointers:

__attribute__((nocf_check)) typedef void (*fp1)();
[[gnu::nocf_check]] typedef void (*fp2)();

so if gcc prints a diagnostic with fp2, it will show the GNU form of
the attribute, because the already existing type of fp1 will be used!
I'm not addressing it here, just an oddity I discovered.


That seems acceptable; they are the same type, just spelled differently.

Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?

-- >8 --
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.

pp_c_attributes_display wasn't able to print the [[]] form of
attributes, so this patch teaches it to.

When printing a pointer to function with an attribute, the attribute
should be printed after the *, because that's what it appertains to.
With this patch we print:

   aka 'void (*__attribute__((nocf_check)))()'
   aka 'void (*[[gnu::nocf_check]])()'

rather than

   aka 'void (__attribute__((nocf_check)) *)()

or crashing in the second case.

pp_c_attributes has been unused since its introduction in r56273 so
this patch removes it.

        PR c++/106937

gcc/c-family/ChangeLog:

        * c-pretty-print.cc (pp_c_specifier_qualifier_list): When
        printing a pointer to function with an attribute, print the
        attribute after the *.
        (pp_c_attributes): Remove.
        (pp_c_attributes_display): Print the [[]] form if appropriate.
        Use get_attribute_name.  Don't print a trailing space.
        * c-pretty-print.h (pp_c_attributes): Remove.

gcc/cp/ChangeLog:

        * error.cc (dump_type_prefix): When printing a pointer/reference to
        function with an attribute, print the attribute after the */&.

gcc/testsuite/ChangeLog:

        * g++.dg/diagnostic/aka5a.C: Adjust.
        * g++.dg/diagnostic/aka5b.C: Likewise.
        * gcc.dg/diag-aka-5a.c: Likewise.
        * gcc.dg/diag-aka-5b.c: Likewise.
        * c-c++-common/pointer-to-fn1.c: New test.
---
  gcc/c-family/c-pretty-print.cc              | 92 +++++++++++----------
  gcc/c-family/c-pretty-print.h               |  1 -
  gcc/cp/error.cc                             |  4 +-
  gcc/testsuite/c-c++-common/pointer-to-fn1.c | 18 ++++
  gcc/testsuite/g++.dg/diagnostic/aka5a.C     |  8 +-
  gcc/testsuite/g++.dg/diagnostic/aka5b.C     |  9 +-
  gcc/testsuite/gcc.dg/diag-aka-5a.c          |  8 +-
  gcc/testsuite/gcc.dg/diag-aka-5b.c          |  8 +-
  8 files changed, 84 insertions(+), 64 deletions(-)
  create mode 100644 gcc/testsuite/c-c++-common/pointer-to-fn1.c

diff --git a/gcc/c-family/c-pretty-print.cc b/gcc/c-family/c-pretty-print.cc
index efa1768f4d6..2523939cffb 100644
--- a/gcc/c-family/c-pretty-print.cc
+++ b/gcc/c-family/c-pretty-print.cc
@@ -466,11 +466,16 @@ pp_c_specifier_qualifier_list (c_pretty_printer *pp, tree 
t)
          {
            pp_c_whitespace (pp);
            pp_c_left_paren (pp);
+           pp_ptr_operator (pp, t);
            pp_c_attributes_display (pp, TYPE_ATTRIBUTES (pointee));
          }
-       else if (!c_dialect_cxx ())
-         pp_c_whitespace (pp);
-       pp_ptr_operator (pp, t);
+       else
+         {
+           /* Removing this WS inconsistency breaks too many tests.  */
+           if (!c_dialect_cxx ())
+             pp_c_whitespace (pp);
+           pp_ptr_operator (pp, t);
+         }
        }
        break;

@@ -850,32 +855,7 @@ c_pretty_printer::declaration (tree t)

    pp_c_init_declarator (this, t);
  }

-/* Pretty-print ATTRIBUTES using GNU C extension syntax. */

-
-void
-pp_c_attributes (c_pretty_printer *pp, tree attributes)
-{
-  if (attributes == NULL_TREE)
-    return;
-
-  pp_c_ws_string (pp, "__attribute__");
-  pp_c_left_paren (pp);
-  pp_c_left_paren (pp);
-  for (; attributes != NULL_TREE; attributes = TREE_CHAIN (attributes))
-    {
-      pp_tree_identifier (pp, TREE_PURPOSE (attributes));
-      if (TREE_VALUE (attributes))
-       pp_c_call_argument_list (pp, TREE_VALUE (attributes));
-
-      if (TREE_CHAIN (attributes))
-       pp_separate_with (pp, ',');
-    }
-  pp_c_right_paren (pp);
-  pp_c_right_paren (pp);
-}
-
-/* Pretty-print ATTRIBUTES using GNU C extension syntax for attributes
-   marked to be displayed on disgnostic.  */
+/* Pretty-print ATTRIBUTES marked to be displayed on diagnostic.  */

void

  pp_c_attributes_display (c_pretty_printer *pp, tree a)
@@ -885,10 +865,12 @@ pp_c_attributes_display (c_pretty_printer *pp, tree a)
    if (a == NULL_TREE)
      return;

+ const bool std_p = cxx11_attribute_p (a);

+
    for (; a != NULL_TREE; a = TREE_CHAIN (a))
      {
-      const struct attribute_spec *as;
-      as = lookup_attribute_spec (TREE_PURPOSE (a));
+      const struct attribute_spec *as
+       = lookup_attribute_spec (get_attribute_name (a));
        if (!as || as->affects_type_identity == false)
          continue;
        if (c_dialect_cxx ()
@@ -896,26 +878,46 @@ pp_c_attributes_display (c_pretty_printer *pp, tree a)
        /* In C++ transaction_safe is printed at the end of the declarator.  */
        continue;
        if (is_first)
-       {
-         pp_c_ws_string (pp, "__attribute__");
-         pp_c_left_paren (pp);
-         pp_c_left_paren (pp);
-         is_first = false;
-       }
+       {
+         if (std_p)
+           {
+             pp_c_left_bracket (pp);
+             pp_c_left_bracket (pp);
+           }
+         else
+           {
+             pp_c_ws_string (pp, "__attribute__");
+             pp_c_left_paren (pp);
+             pp_c_left_paren (pp);
+           }
+         is_first = false;
+       }
        else
-       {
-         pp_separate_with (pp, ',');
-       }
-      pp_tree_identifier (pp, TREE_PURPOSE (a));
+       pp_separate_with (pp, ',');
+      tree ns;
+      if (std_p && (ns = get_attribute_namespace (a)))
+       {
+         pp_tree_identifier (pp, ns);
+         pp_colon (pp);
+         pp_colon (pp);
+       }
+      pp_tree_identifier (pp, get_attribute_name (a));
        if (TREE_VALUE (a))
-       pp_c_call_argument_list (pp, TREE_VALUE (a));
+       pp_c_call_argument_list (pp, TREE_VALUE (a));
      }

if (!is_first)

      {
-      pp_c_right_paren (pp);
-      pp_c_right_paren (pp);
-      pp_c_whitespace (pp);
+      if (std_p)
+       {
+         pp_c_right_bracket (pp);
+         pp_c_right_bracket (pp);
+       }
+      else
+       {
+         pp_c_right_paren (pp);
+         pp_c_right_paren (pp);
+       }
      }
  }

diff --git a/gcc/c-family/c-pretty-print.h b/gcc/c-family/c-pretty-print.h

index be86bed4fee..92674ab4d06 100644
--- a/gcc/c-family/c-pretty-print.h
+++ b/gcc/c-family/c-pretty-print.h
@@ -119,7 +119,6 @@ void pp_c_space_for_pointer_operator (c_pretty_printer *, 
tree);
  /* Declarations.  */
  void pp_c_tree_decl_identifier (c_pretty_printer *, tree);
  void pp_c_function_definition (c_pretty_printer *, tree);
-void pp_c_attributes (c_pretty_printer *, tree);
  void pp_c_attributes_display (c_pretty_printer *, tree);
  void pp_c_cv_qualifiers (c_pretty_printer *pp, int qualifiers, bool 
func_type);
  void pp_c_type_qualifier_list (c_pretty_printer *, tree);
diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc
index 4514c8bbb44..4ce59157383 100644
--- a/gcc/cp/error.cc
+++ b/gcc/cp/error.cc
@@ -897,7 +897,6 @@ dump_type_prefix (cxx_pretty_printer *pp, tree t, int flags)
          {
            pp_cxx_whitespace (pp);
            pp_cxx_left_paren (pp);
-           pp_c_attributes_display (pp, TYPE_ATTRIBUTES (sub));
          }
        if (TYPE_PTR_P (t))
          pp_star (pp);
@@ -908,6 +907,9 @@ dump_type_prefix (cxx_pretty_printer *pp, tree t, int flags)
            else
              pp_ampersand (pp);
          }
+       if (TREE_CODE (sub) == ARRAY_TYPE
+           || TREE_CODE (sub) == FUNCTION_TYPE)
+         pp_c_attributes_display (pp, TYPE_ATTRIBUTES (sub));
        pp->padding = pp_before;
        pp_cxx_cv_qualifier_seq (pp, t);
        }
diff --git a/gcc/testsuite/c-c++-common/pointer-to-fn1.c 
b/gcc/testsuite/c-c++-common/pointer-to-fn1.c
new file mode 100644
index 00000000000..8b842e0774a
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pointer-to-fn1.c
@@ -0,0 +1,18 @@
+/* PR c++/106937 */
+/* { dg-options "-fcf-protection" } */
+/* { dg-additional-options "-std=c++11 -fpermissive" { target c++ } } */
+/* Test printing a pointer to function with attribute.  */
+
+__attribute__((nocf_check)) typedef void (*FPA1)();
+[[gnu::nocf_check]] typedef void (*FPA2)(int);
+typedef void (*FP1)();
+typedef void (*FP2)(int);
+
+void
+g (FP1 f1, FP2 f2)
+{
+  FPA1 p1 = f1; // { dg-warning {aka .void 
\(\*__attribute__\(\(nocf_check\)\)\)\(\)} }
+  FPA2 p2 = f2; // { dg-warning {aka .void 
\(\*\[\[gnu::nocf_check\]\]\)\(int\)} }
+  FP1 p3 = p1; // { dg-warning {aka .void 
\(\*__attribute__\(\(nocf_check\)\)\)\(\)} }
+  FP2 p4 = p2; // { dg-warning {aka .void 
\(\*\[\[gnu::nocf_check\]\]\)\(int\)} }
+}
diff --git a/gcc/testsuite/g++.dg/diagnostic/aka5a.C 
b/gcc/testsuite/g++.dg/diagnostic/aka5a.C
index e9d4c02f61d..94923c298dd 100644
--- a/gcc/testsuite/g++.dg/diagnostic/aka5a.C
+++ b/gcc/testsuite/g++.dg/diagnostic/aka5a.C
@@ -82,8 +82,8 @@ void f (s s1)
    ue_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy 
\(\*\)\(\)' {aka 'user_enum \(\*\)\(\)'} in assignment} }
    ue_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(user_enum\)'} in assignment} }
    ue_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(user_enum, \.\.\.\)'} in 
assignment} }
-  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' in assignment} }
-  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' in assignment} }
+  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_enum_copy \(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }

us1 = s1; // { dg-error {no match for 'operator=' in 'us1 = s1' \(operand types are 'user_struct' and 's'\)} }

    us2 = s1; // { dg-error {no match for 'operator=' in 'us2 = s1' \(operand 
types are 'user_struct_copy' {aka 'user_struct'} and 's'\)} }
@@ -122,6 +122,6 @@ void f (s s1)
    ui_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy 
\(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
    ui_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} in assignment} }
    ui_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
-  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
-  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_int_copy \(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }
  }
diff --git a/gcc/testsuite/g++.dg/diagnostic/aka5b.C 
b/gcc/testsuite/g++.dg/diagnostic/aka5b.C
index 6942be3eef1..45a0ce378f6 100644
--- a/gcc/testsuite/g++.dg/diagnostic/aka5b.C
+++ b/gcc/testsuite/g++.dg/diagnostic/aka5b.C
@@ -81,8 +81,8 @@ void f (s s1)
    ue_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy 
\(\*\)\(\)' {aka '__internal_enum \(\*\)\(\)'} in assignment} }
    ue_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(__internal_enum\)'} in assignment} }
    ue_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(__internal_enum, \.\.\.\)'} in 
assignment} }
-  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka '__internal_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
-  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 
'__internal_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in 
assignment} }
+  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka '__internal_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }
+  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_enum_copy \(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 
'__internal_enum \(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} 
}

us1 = s1; // { dg-error {no match for 'operator=' in 'us1 = s1' \(operand types are 'user_struct' {aka '__internal_struct'} and 's'\)} }

    us2 = s1; // { dg-error {no match for 'operator=' in 'us2 = s1' \(operand 
types are 'user_struct_copy' {aka '__internal_struct'} and 's'\)} }
@@ -121,7 +121,6 @@ void f (s s1)
    ui_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy 
\(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
    ui_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} in assignment} }
    ui_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void 
\(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
-  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
-  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 
'user_int_copy \(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(\)'} in assignment} }
  }
-
diff --git a/gcc/testsuite/gcc.dg/diag-aka-5a.c 
b/gcc/testsuite/gcc.dg/diag-aka-5a.c
index 8768a79204a..227c01c16db 100644
--- a/gcc/testsuite/gcc.dg/diag-aka-5a.c
+++ b/gcc/testsuite/gcc.dg/diag-aka-5a.c
@@ -88,8 +88,8 @@ void f (struct s s)
    ue_fn_ptr4 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(\*\)\(void\)' {aka 'user_enum \(\*\)\(void\)'} from incompatible pointer type 
'struct s \*'} } */
    ue_fn_ptr5 = &s; /* { dg-error {assignment to 'void 
\(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(user_enum\)'} from incompatible 
pointer type 'struct s \*'} } */
    ue_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy, 
\.\.\.\)' {aka 'void \(\*\)\(user_enum, \.\.\.\)'} from incompatible pointer type 
'struct s \*'} } */
-  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' from incompatible pointer 
type 'struct s \*'} } */
-  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */

us1 = s; /* { dg-error {assigning to type 'user_struct' from type 'struct s'} } */

    us2 = s; /* { dg-error {assigning to type 'user_struct_copy' {aka 
'user_struct'} from type 'struct s'} } */
@@ -130,6 +130,6 @@ void f (struct s s)
    ui_fn_ptr4 = &s; /* { dg-error {assignment to 'user_int_copy 
\(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s 
\*'} } */
    ui_fn_ptr5 = &s; /* { dg-error {assignment to 'void 
\(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 
'struct s \*'} } */
    ui_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy, 
\.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct 
s \*'} } */
-  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
-  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
  }
diff --git a/gcc/testsuite/gcc.dg/diag-aka-5b.c 
b/gcc/testsuite/gcc.dg/diag-aka-5b.c
index e0ec7c816a2..848b1b76888 100644
--- a/gcc/testsuite/gcc.dg/diag-aka-5b.c
+++ b/gcc/testsuite/gcc.dg/diag-aka-5b.c
@@ -87,8 +87,8 @@ void f (struct s s)
    ue_fn_ptr4 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(\*\)\(void\)' {aka 'enum __internal_enum \(\*\)\(void\)'} from incompatible 
pointer type 'struct s \*'} } */
    ue_fn_ptr5 = &s; /* { dg-error {assignment to 'void 
\(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(enum __internal_enum\)'} from 
incompatible pointer type 'struct s \*'} } */
    ue_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy, 
\.\.\.\)' {aka 'void \(\*\)\(enum __internal_enum, \.\.\.\)'} from incompatible 
pointer type 'struct s \*'} } */
-  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'enum __internal_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
-  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'enum __internal_enum 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'enum __internal_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'enum __internal_enum 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */

us1 = s; /* { dg-error {assigning to type 'user_struct' {aka 'struct __internal_struct'} from type 'struct s'} } */

    us2 = s; /* { dg-error {assigning to type 'user_struct_copy' {aka 'struct 
__internal_struct'} from type 'struct s'} } */
@@ -129,6 +129,6 @@ void f (struct s s)
    ui_fn_ptr4 = &s; /* { dg-error {assignment to 'user_int_copy 
\(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s 
\*'} } */
    ui_fn_ptr5 = &s; /* { dg-error {assignment to 'void 
\(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 
'struct s \*'} } */
    ui_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy, 
\.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct 
s \*'} } */
-  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
-  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int 
\(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
+  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)' {aka 'int 
\(\*__attribute__\(\(transaction_unsafe\)\)\)\(void\)'} from incompatible pointer 
type 'struct s \*'} } */
  }

base-commit: 629d04d35d819bdc26c30d215bc4ea66a74af15b

Re: [PATCH v3] c-family: ICE with [[gnu::nocf_check]] [PR106937]

Reply via email to