From df51934dcee2328fb6a257bdda7e177f8b2cc6a2 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 24 Oct 2018 21:39:23 +0200 Subject: [PATCH] re PR c++/86288 (Recognize __gnu and/or __gnu__ as attribute-namespace) PR c++/86288 * parser.c (cp_parser_std_attribute): Canonicalize attr_ns, and when :: is not present and attr_ns non-NULL, canonicalize also attr_id. (cp_parser_attribute_spec): Fix comment typo. * g++.dg/cpp0x/gen-attrs-66.C: New test. From-SVN: r265470 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/parser.c | 11 ++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/gen-attrs-66.C | 12 ++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/gen-attrs-66.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fad86908102..c90d91b7b82 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-10-24 Jakub Jelinek + + PR c++/86288 + * parser.c (cp_parser_std_attribute): Canonicalize attr_ns, and when + :: is not present and attr_ns non-NULL, canonicalize also attr_id. + (cp_parser_attribute_spec): Fix comment typo. + 2018-10-24 Martin Sebor PR c++/84851 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c46b77608b2..2533871fb28 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -25327,14 +25327,19 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns) return error_mark_node; } + attr_ns = canonicalize_attr_name (attr_ns); attr_id = canonicalize_attr_name (attr_id); attribute = build_tree_list (build_tree_list (attr_ns, attr_id), NULL_TREE); token = cp_lexer_peek_token (parser->lexer); } else if (attr_ns) - attribute = build_tree_list (build_tree_list (attr_ns, attr_id), - NULL_TREE); + { + attr_ns = canonicalize_attr_name (attr_ns); + attr_id = canonicalize_attr_name (attr_id); + attribute = build_tree_list (build_tree_list (attr_ns, attr_id), + NULL_TREE); + } else { attr_id = canonicalize_attr_name (attr_id); @@ -25526,7 +25531,7 @@ cp_parser_std_attribute_spec (cp_parser *parser) || !cp_parser_require (parser, CPP_CLOSE_SQUARE, RT_CLOSE_SQUARE)) cp_parser_skip_to_end_of_statement (parser); else - /* Warn about parsing c++11 attribute in non-c++1 mode, only + /* Warn about parsing c++11 attribute in non-c++11 mode, only when we are sure that we have actually parsed them. */ maybe_warn_cpp0x (CPP0X_ATTRIBUTES); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6f9ba884e04..96ef4b999bc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-10-24 Jakub Jelinek + + PR c++/86288 + * g++.dg/cpp0x/gen-attrs-66.C: New test. + 2018-10-24 Martin Sebor PR c++/84851 diff --git a/gcc/testsuite/g++.dg/cpp0x/gen-attrs-66.C b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-66.C new file mode 100644 index 00000000000..de81dbb5a03 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-66.C @@ -0,0 +1,12 @@ +// PR c++/86288 +// { dg-do compile { target c++11 } } +// { dg-options "-Wattributes" } + +int a [[gnu::aligned(alignof(int))]]; +int b [[gnu::__aligned__(alignof(int))]]; +int c [[__gnu__::aligned(alignof(int))]]; +int d [[__gnu__::__aligned__(alignof(int))]]; +int e [[using gnu : aligned(alignof(int))]]; // { dg-warning "attribute using prefix only available" "" { target c++14_down } } +int f [[using gnu : __aligned__(alignof(int))]]; // { dg-warning "attribute using prefix only available" "" { target c++14_down } } +int g [[using __gnu__ : aligned(alignof(int))]]; // { dg-warning "attribute using prefix only available" "" { target c++14_down } } +int h [[using __gnu__ : __aligned__(alignof(int))]]; // { dg-warning "attribute using prefix only available" "" { target c++14_down } } -- 2.30.2