[i386,c,c++] : PR/12171 - calling convention omitted in error message

2010/12/23 Gabriel Dos Reis <gdr@integrable-solutions.net>:
> On Thu, Dec 23, 2010 at 6:25 AM, Joseph S. Myers
> <joseph@codesourcery.com> wrote:
>> On Wed, 22 Dec 2010, Gabriel Dos Reis wrote:
>>
>>> I'm satisfied with the patch.
>>
>> I still maintain that even if you do wish to print only some attributes
>> (in which case I'd say the hook should be a hook to say what target
>> attributes to print, not one saying what's a calling convention
>> attribute, since the two sets need not be the same) the duplication
>> between ix86_attribute_affects_calling_convention and other functions in
>> knowing what attributes are calling convention attributes is best avoided.
>> And manually handling the possibility of leading and trailing __ in a back
>> end is certainly a bad idea; we have a perfectly good is_attribute_p
>> function to handle this in one place only.
>>
>> Even better than a hook saying whether to print an attribute would be an
>> additional field in struct attribute_spec saying whether an attribute
>> (target or not) should be printed.  That way the information - if you do
>> want to print only some attributes - would be provided via an existing
>> data hook rather than needing a new function hook at all, and you can
>> easily start printing some target-independent attributes as well if
>> desired.
>
> I agree that code duplication is not a good idea, and your suggestion of
> is_attribute_p is a very good one.
>
> On ther other hand, we should not embark on the road of printing
> all possible attributes in a type, so having a general purpose
> hook for that does not strike me as a good think.  That leaves the
> possibility of adding a field to attribute_spec which I like.
>
> -- Gaby
>

Well, as here no further agreement was found, I post here the
alternative suggested by Joseph. I am open-minded which approach will
be choosen. I just want to fix this long pending issue.
I splitted up this patch in two parts. The first simply extends the
struct attribute_spec by new member 'on_diagnostic' and extends the
the uses of this structure by this new field. This new member
specifiedsif the attribute shall be show on diagnostic output, or not.

ChangeLog gcc/

2011-01-01  Kai Tietz

	PR target/12171
	* doc/plugins.texi: Adjust documentation
	for plugin register_callback.
	* tree.h (attribute_spec): Add new member
	on_diagnostic.
	* attribs.c (empty_attribute_table): Adjust
	attribute_spec initializers.
	* config/alpha/alpha.c: Likewise.
	* config/arc/arc.c: Likewise.
	* config/arm/arm.c: Likewise.
	* config/avr/avr.c: Likewise.
	* config/bfin/bfin.c: Likewise.
	* config/crx/crx.c: Likewise.
	* config/darwin.h: Likewise.
	* config/h8300/h8300.c: Likewise.
	* config/i386/cygming.h: Likewise.
	* config/i386/i386.c: Likewise.
	* config/ia64/ia64.c: Likewise.
	* config/m32c/m32c.c: Likewise.
	* config/m32r/m32r.c: Likewise.
	* config/m68hc11/m68hc11.c: Likewise.
	* config/m68k/m68k.c: Likewise.
	* config/mcore/mcore.c: Likewise.
	* config/mep/mep.c: Likewise.
	* config/microblaze/microblaze.c: Likewise.
	* config/mips/mips.c: Likewise.
	* config/rs6000/rs6000.c: Likewise.
	* config/rx/rx.c: Likewise.
	* config/sh/sh.c: Likewise.
	* config/sol2.h: Likewise.
	* config/sparc/sparc.c: Likewise.
	* config/spu/spu.c: Likewise.
	* config/stormy16/stormy16.c: Likewise.
	* config/v850/v850.c: Likewise.

ChangeLog gcc/cp

2011-01-01  Kai Tietz

	PR target/12171
	* tree.c (cxx_attribute_table): Adjust table.

ChangeLog gcc/testsuite

2011-01-01  Kai Tietz

	PR target/12171
	* g++.dg/plugin/attribute_plugin.c: Adjust test.

ChangeLog gcc/java

2011-01-01  Kai Tietz

	PR target/12171
	* lang.c (java_attribute_table): Adjust table.

ChangeLog gcc/lto

2011-01-01  Kai Tietz

	PR target/12171
	* lto-lang.c (lto_attribute_table): Adjust table.

ChangeLog gcc/ada

2011-01-01  Kai Tietz

	PR target/12171
	* gcc-interface/utils.c (gnat_internal_attribute_table):
	Add new element.

ChangeLog gcc/c-family

2011-01-01  Kai Tietz

	PR target/12171
	* c-common.c (c_common_attribute_table):
	Add new element.
	(c_common_format_attribute_table): Likewise.

The second part is the patch for c and c++ frontend parts to use new
diagnostic option for displaying of function pointer types.

ChangeLog gcc/c-family

2011-01-01  Kai Tietz

	PR target/12171
	* c-pretty-print.c (pp_c_specifier_qualifier_list):
	Display allowed attributes for function pointer types.
	(pp_c_attributes_display): New function to display
	attributes having on_diagnostic flag set to true.
	* c-pretty-print.h (pp_c_attributes_display): New prototype.

ChangeLog gcc/cp

2011-01-01  Kai Tietz

	PR target/12171
	* cxx-pretty-print.c (pp_cxx_ptr_operator):
	Display allowed attributes for function pointer types.
	* error.c (dump_type_prefix): Likewise.

Test is tested for i686-pc-linux, x86_64-pc-linux, x86_64-w64-mingw32,
i686-pc-cygwin.

Ok for apply?

Regards,
Kai

Index: gcc/gcc/c-family/c-pretty-print.c
===================================================================

--- gcc.orig/gcc/c-family/c-pretty-print.c	2010-12-03 19:45:51.000000000 +0100
+++ gcc/gcc/c-family/c-pretty-print.c	2011-01-01 16:48:22.078574100 +0100
@@ -460,6 +460,7 @@ pp_c_specifier_qualifier_list (c_pretty_
 	  {
 	    pp_c_whitespace (pp);
 	    pp_c_left_paren (pp);
+	    pp_c_attributes_display (pp, TYPE_ATTRIBUTES (pointee));
 	  }
 	else if (!c_dialect_cxx ())
 	  pp_c_whitespace (pp);
@@ -790,6 +791,47 @@ pp_c_attributes (c_pretty_printer *pp, t
   pp_c_right_paren (pp);
 }
 
+/* Pretty-print ATTRIBUTES using GNU C extension syntax for attributes
+   marked to be displayed on disgnostic.  */
+
+void
+pp_c_attributes_display (c_pretty_printer *pp, tree a)
+{
+  bool is_first = true;
+
+  if (a == NULL_TREE)
+    return;
+
+  for (; a != NULL_TREE; a = TREE_CHAIN (a))
+    {
+      const struct attribute_spec *as;
+      as = lookup_attribute_spec (TREE_PURPOSE (a));
+      if (!as || as->on_diagnostic == false)
+        continue;
+      if (is_first)
+       {
+         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));
+      if (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);
+    }
+}
+
 /* function-definition:
       declaration-specifiers declarator compound-statement  */
 
Index: gcc/gcc/c-family/c-pretty-print.h
===================================================================
--- gcc.orig/gcc/c-family/c-pretty-print.h	2010-09-09 15:59:07.000000000 +0200
+++ gcc/gcc/c-family/c-pretty-print.h	2011-01-01 16:50:12.810907600 +0100
@@ -176,6 +176,7 @@ void pp_c_space_for_pointer_operator (c_
 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);
 void pp_c_parameter_type_list (c_pretty_printer *, tree);
Index: gcc/gcc/cp/cxx-pretty-print.c
===================================================================
--- gcc.orig/gcc/cp/cxx-pretty-print.c	2010-12-31 11:36:43.000000000 +0100
+++ gcc/gcc/cp/cxx-pretty-print.c	2011-01-01 16:55:30.584083200 +0100
@@ -1323,6 +1323,8 @@ pp_cxx_ptr_operator (cxx_pretty_printer
       if (TREE_CODE (TREE_TYPE (t)) == POINTER_TYPE
 	  || TYPE_PTR_TO_MEMBER_P (TREE_TYPE (t)))
 	pp_cxx_ptr_operator (pp, TREE_TYPE (t));
+      pp_c_attributes_display (pp_c_base (pp),
+			       TYPE_ATTRIBUTES (TREE_TYPE (t)));
       if (TREE_CODE (t) == POINTER_TYPE)
 	{
 	  pp_star (pp);
Index: gcc/gcc/cp/error.c
===================================================================
--- gcc.orig/gcc/cp/error.c	2010-12-31 11:36:42.000000000 +0100
+++ gcc/gcc/cp/error.c	2011-01-01 16:52:03.938263800 +0100
@@ -661,6 +661,8 @@ dump_type_prefix (tree t, int flags)
 	  {
 	    pp_cxx_whitespace (cxx_pp);
 	    pp_cxx_left_paren (cxx_pp);
+	    pp_c_attributes_display (pp_c_base (cxx_pp),
+				     TYPE_ATTRIBUTES (sub));
 	  }
 	if (TREE_CODE (t) == POINTER_TYPE)
 	  pp_character(cxx_pp, '*');


[i386,c,c++] : PR/12171 - calling convention omitted in error message

Commit Message

Comments

Patch