]> git.ipfire.org Git - thirdparty/gcc.git/commit - gcc/c-family/c-common.c
PR c++/53528 C++11 attribute support
authorDodji Seketeli <dodji@redhat.com>
Mon, 8 Oct 2012 09:29:05 +0000 (09:29 +0000)
committerDodji Seketeli <dodji@gcc.gnu.org>
Mon, 8 Oct 2012 09:29:05 +0000 (11:29 +0200)
commite28d52cffbb2abc7a5764ed4c97a25c376913fee
tree1a1442f932577112e42d0c3a2bb905d3ce01d5de
parentf70308d411efebfce8f15b54fedd21c17d44740c
PR c++/53528 C++11 attribute support

This patch implements the c++-11 generalized attributes, described in
the N2761 paper[1].

The idea is to modify the front-end to accept the new attribute syntax
(including alignas expressions) and to build an internal
representation similar to the one we already have for GNU attributes.

This lets us re-use our existing GNU attribute mechanisms to support
the generalized c++11 attributes.

The patch does change the existing internal representation to support
scoped attribute (aka attributes with namespaces), which is a concept
that doesn't exist in GNU attributes.  I have thus put all existing
GNU extension attributes into the "gnu" namespace.  For instance, in
C++-11, the "unused" attribute would be represented as
"[[gnu::unused]]".  Because there is no syntax for scoped attributes
in C, writting "__attribute__((unused))" unconditionnally refers to
the "unused" attribute in the "gnu" namespace.

Note that this patch follows a conservative understanding of the
specification by disallowing attributes appertaining to types, unless
they apply to a type definition.

Tested on x86_64-unknown-linux-gnu and powerpc64-unknown-linux-gnu.

[1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf

gcc/
* plugin.h (register_scoped_attributes): Declare new function.
* tree.h (enu attribute_flags::ATTR_FLAG_CXX_11): New flag.
(lookup_scoped_attribute_spec, cxx_11_attribute_p)
(get_attribute_name, get_attribute_namespace): Declare new functions.
(struct attribute_spec): Remove const qualifier from the members.
* tree.c (comp_type_attributes, private_lookup_attribute)
(lookup_ident_attribute, remove_attribute, merge_attribute)
(attribute_hash_list, attribute_list_contained): Use
get_attribute_name.
* attribs.c (decl_attributes): Don't crash on error_mark_node.
Forbid c++11 attributes appertaining to type-specifiers.
(attribute_hash): Remove global variable.
(attributes_table): New global variable.
(find_attribute_namespace, register_scoped_attribute): New static
functions.
(register_scoped_attributes, lookup_scoped_attribute_spec)
(cxx11_attribute_p, get_attribute_name, get_attribute_namespace):
New public functions.
(init_attributes): Register all the GNU attributes into the "gnu"
namespace.
(register_attribute): Use register_scoped_attribute to register
the attribute into the "gnu" namespace.
(lookup_attribute_spec): Use lookup_scoped_attribute_spec to
lookup the attribute in the "gnu" namespace.
(decl_attributes): Use new get_attribute_namespace and
lookup_scoped_attribute_spec to consider attribute namespaces when
looking up attributes.  When operating in c++-11 mode, pass flag
ATTR_FLAG_CXX11 to the spec handler.

gcc/c-family/

* c-common.h (bitfield_p, cxx_fundamental_alignment_p): Declare
new functions.
* c-common.c (check_cxx_fundamental_alignment_constraints): New
static function.
(handle_aligned_attribute): In choose strictest alignment
among many.  Use new check_cxx_fundamental_alignment_constraints.
(handle_transparent_union_attribute): In c++11 attribute syntax,
don't look through typedefs.

gcc/cp/

* cp-tree.h (enum cpp0x_warn_str::CPP0X_ATTRIBUTES): New member.
(enum cp_decl_spec::ds_std_attribute): New enumerator.
(struct cp_decl_specifier_seq::std_attributes): New field.
(cxx_alignas_expr, warn_misplaced_attr_for_class_type): Declare
new functions.
(check_tag_decl): Take an extra parameter for explicit
instantiations.
* decl.c (warn_misplaced_attr_for_class_type): Extract from ...
(check_tag_decl): ... here.  Add check for c++11 attributes being
applied to an explicit instantiation.  Take an extra parameter for
explicit instantiations.
(grokdeclarator): Make sure a c++11 attribute after an array
declarator appertains to the array, an attribute after a function
declarator appertains to the function type, an attribute after a
declarator-id appertains to the entity being declared, and an
attribute after a pointer declarator appertains to the pointer.
* decl2.c (is_late_template_attribute): Use get_attribute_name.
* error.c (maybe_warn_cpp0x): Support
CPP0X_GENERALIZED_ATTRIBUTES.
* parser.c (cp_next_tokens_can_be_attribute_p)
(cp_next_tokens_can_be_gnu_attribute_p)
(cp_next_tokens_can_be_std_attribute_p)
(cp_nth_tokens_can_be_attribute_p)
(cp_nth_tokens_can_be_gnu_attribute_p)
(cp_nth_tokens_can_be_std_attribute_p)
(cp_parser_gnu_attribute_list, cp_parser_std_attribute)
(cp_parser_std_attribute_spec, cp_parser_std_attribute_spec_seq)
(cp_parser_attributes_opt, cp_parser_std_attribute_list): New
static functions.
(cp_parser_gnu_attributes_opt): Replace cp_parser_attributes_opt.
(cp_parser_gnu_attribute_list): Replace cp_parser_attribute_list.
(cp_parser_postfix_expression): Disallow "[[" tokens here.
(cp_parser_label_for_labeled_statement): Use take an extra
parameter for attributes.
(cp_parser_block_declaration): Use
cp_nth_tokens_can_be_std_attribute_p here.
(cp_parser_decl_specifier_seq): Likewise.  Store C++11 attributes
that appears in in decl specifiers in cp_decl_specifier_seq::std_attributes.
declaration.  Emit proper warning about misplaced c++11 attributes
for class type.
(cp_parser_explicit_instantiation): Adjust call to check_tag_decl.
(cp_parser_init_declarator):  Parsing attributes here is no more a
GNU extension in c++-11.
(cp_parser_type_specifier_seq): Use
cp_next_tokens_can_be_attribute_p.
(cp_parser_direct_declarator): Likewise.  Hang c++11 attributes
following the declarator to its syntactic construct.  It'll later
be applied to the proper appertaining entity by grokdeclarator.
(cp_parser_ptr_operator): Likewise.
(make_declarator): Initialize cp_declarator::std_attribute.
(make_pointer_declarator, make_reference_declarator)
(make_ptrmem_declarator, cp_parser_make_indirect_declarator): Take
attributes that appertain to the pointer/reference in argument.
(cp_parser_ptr_operator): Take an out parameter for c++11
attributes.  Update comments.
(cp_parser_new_declarator_opt)
(cp_parser_conversion_declarator_opt): Adjust.
(cp_parser_declarator): Likewise.  Handle C++11 attributes.
Rename attributes to gnu_attribute for better legibility.
(cp_parser_simple_declaration): Update comment.
(cp_parser_class_specifier_1): Parse GNU attributes specifically
(cp_parser_enum_specifier): Accept only gnu attributes after the
specifier.
(cp_parser_member_declaration): Don't clear attributes -- intended
for the entity being declared -- too early because check_tag_decl
needs them.
(cp_parser_statement): Update comment.  Parse optional c++11
attributes at the beginning of the relevant kind of statements and
ignore them, for now, unless when calling
cp_parser_label_for_labeled_statement.
(cp_parser_label_for_labeled_statement): Take c++11 attributes
in parameter.
* semantics.c (potential_constant_expression_1): Likewise.
* typeck.c (fundamental_alignment_p, cxx_alignas_expr): New public
functions.

gcc/testsuite/

* g++.dg/cpp0x/gen-attrs-1.C: New test.
* g++.dg/cpp0x/gen-attrs-2.C: Likewise.
* g++.dg/cpp0x/gen-attrs-2-1.C: Likewise.
* g++.dg/cpp0x/gen-attrs-3.C: Likewise.
* g++.dg/cpp0x/gen-attrs-4.C: Likewise.
* g++.dg/cpp0x/gen-attrs-5.C: Likewise.
* g++.dg/cpp0x/gen-attrs-6.C: Likewise.
* g++.dg/cpp0x/gen-attrs-7.C: Likewise.
* g++.dg/cpp0x/gen-attrs-8.C: Likewise.
* g++.dg/cpp0x/gen-attrs-9.C: Likewise.
* g++.dg/cpp0x/gen-attrs-10.C: Likewise.
* g++.dg/cpp0x/gen-attrs-11.C: Likewise.
* g++.dg/cpp0x/gen-attrs-12.C: Likewise.
* g++.dg/cpp0x/gen-attrs-13.C: Likewise.
* g++.dg/cpp0x/gen-attrs-14.C: Likewise.
* g++.dg/cpp0x/gen-attrs-15.C: Likewise.
* g++.dg/cpp0x/gen-attrs-16.C: Likewise.
* g++.dg/cpp0x/gen-attrs-17.C: Likewise.
* g++.dg/cpp0x/gen-attrs-18.C: Likewise.
* g++.dg/cpp0x/gen-attrs-19.C: Likewise.
* g++.dg/cpp0x/gen-attrs-20.C: Likewise.
* g++.dg/cpp0x/gen-attrs-21.C: Likewise.
* g++.dg/cpp0x/gen-attrs-22.C: Likewise.
* g++.dg/cpp0x/gen-attrs-23.C: Likewise.
* g++.dg/cpp0x/gen-attrs-24.C: Likewise.
* g++.dg/cpp0x/gen-attrs-25.C: Likewise.
* g++.dg/cpp0x/gen-attrs-26.C: Likewise.
* g++.dg/cpp0x/gen-attrs-27.C: Likewise.
* g++.dg/cpp0x/gen-attrs-28.C: Likewise.
* g++.dg/cpp0x/gen-attrs-29.C: Likewise.
* g++.dg/cpp0x/gen-attrs-30.C: Likewise.
* g++.dg/cpp0x/gen-attrs-31.C: Likewise.
* g++.dg/cpp0x/gen-attrs-32.C: Likewise.
* g++.dg/cpp0x/gen-attrs-33.C: Likewise.
* g++.dg/cpp0x/gen-attrs-34.C: Likewise.
* g++.dg/cpp0x/gen-attrs-35.C: Likewise.
* g++.dg/cpp0x/gen-attrs-36.C: Likewise.
* g++.dg/cpp0x/gen-attrs-36-1.C: Likewise.
* g++.dg/cpp0x/gen-attrs-37.C: Likewise.
* g++.dg/cpp0x/gen-attrs-38.C: Likewise.
* g++.dg/cpp0x/gen-attrs-39.C: Likewise.
* g++.dg/cpp0x/gen-attrs-39-1.C: Likewise.
* g++.dg/cpp0x/gen-attrs-40.C: Likewise.
* g++.dg/cpp0x/gen-attrs-41.C: Likewise.
* g++.dg/cpp0x/gen-attrs-42.C: Likewise.
* g++.dg/cpp0x/gen-attrs-43.C: Likewise.
* g++.dg/cpp0x/gen-attrs-44.C: Likewise.
* g++.dg/cpp0x/gen-attrs-45.C: Likewise.
* g++.dg/cpp0x/gen-attrs-46.C: Likewise.
* g++.dg/cpp0x/gen-attrs-47.C: Likewise.
* g++.dg/cpp0x/gen-attrs-47-1.C: Likewise.
* g++.dg/cpp0x/gen-attrs-48.C: Likewise.
* g++.dg/cpp0x/gen-attrs-49.C: Likewise.
* g++.dg/cpp0x/gen-attrs-50.C: Likewise.
* g++.dg/cpp0x/gen-attrs-51.C: Likewise.
* g++.dg/cpp0x/gen-attrs-52.C: Likewise.
* g++.dg/cpp0x/gen-attrs-53.C: Likewise.

From-SVN: r192199
74 files changed:
gcc/ChangeLog
gcc/attribs.c
gcc/c-family/ChangeLog
gcc/c-family/c-common.c
gcc/c-family/c-common.h
gcc/cp/ChangeLog
gcc/cp/cp-tree.h
gcc/cp/decl.c
gcc/cp/decl2.c
gcc/cp/error.c
gcc/cp/parser.c
gcc/cp/typeck.c
gcc/plugin.h
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/cpp0x/gen-attrs-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-10.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-11.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-12.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-13.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-14.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-15.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-16.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-17.2.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-17.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-18.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-19.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-2-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-2.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-20.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-21.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-22.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-23.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-24.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-25.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-26.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-27.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-28.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-29.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-3.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-30.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-31.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-32.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-33.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-34.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-35.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-36-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-36.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-37.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-38.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-39-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-39.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-4.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-40.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-41.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-42.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-43.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-44.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-45.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-46.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-47-1.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-47.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-48.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-49.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-5.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-50.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-51.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-52.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-53.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-6.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-7.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-8.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/gen-attrs-9.C [new file with mode: 0644]
gcc/tree.c
gcc/tree.h