diff options
author | Joseph Myers <joseph@codesourcery.com> | 2020-10-27 22:15:46 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2020-10-27 22:15:46 +0000 |
commit | 75ce04fba49eb30b6a8fe23bc3605cf0ef9a8e28 (patch) | |
tree | 4dd84b104dc8e59b2dca26841152fe0abc57e07e /gcc/c/c-parser.c | |
parent | 668894d7b584b40ddb46e9e2e2ffa637f4d732e5 (diff) | |
download | gcc-75ce04fba49eb30b6a8fe23bc3605cf0ef9a8e28.zip gcc-75ce04fba49eb30b6a8fe23bc3605cf0ef9a8e28.tar.gz gcc-75ce04fba49eb30b6a8fe23bc3605cf0ef9a8e28.tar.bz2 |
c: Allow duplicate C2x standard attributes
N2557, accepted into C2x at the October WG14 meeting, removes the
requirement that duplicates of standard attributes cannot appear
within an attribute list (so allowing e.g. [[deprecated, deprecated]],
where previously that was disallowed but [[deprecated]] [[deprecated]]
was OK). Remove the code checking for this (standard attributes
aren't in any released version of the C standard) and update tests
accordingly.
Bootstrapped with no regressions on x86_64-pc-linux-gnu.
gcc/c/
2020-10-27 Joseph Myers <joseph@codesourcery.com>
* c-parser.c (c_parser_std_attribute_specifier): Allow duplicate
standard attributes.
gcc/testsuite/
2020-10-27 Joseph Myers <joseph@codesourcery.com>
* gcc.dg/c2x-attr-deprecated-4.c, gcc.dg/c2x-attr-fallthrough-4.c,
gcc.dg/c2x-attr-maybe_unused-4.c: Allow duplicate attributes.
Diffstat (limited to 'gcc/c/c-parser.c')
-rw-r--r-- | gcc/c/c-parser.c | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index b6a7ef4..d49e508 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -4977,9 +4977,6 @@ c_parser_std_attribute (c_parser *parser, bool for_tm) static tree c_parser_std_attribute_specifier (c_parser *parser, bool for_tm) { - bool seen_deprecated = false; - bool seen_fallthrough = false; - bool seen_maybe_unused = false; location_t loc = c_parser_peek_token (parser)->location; if (!c_parser_require (parser, CPP_OPEN_SQUARE, "expected %<[%>")) return NULL_TREE; @@ -5005,55 +5002,8 @@ c_parser_std_attribute_specifier (c_parser *parser, bool for_tm) tree attribute = c_parser_std_attribute (parser, for_tm); if (attribute != error_mark_node) { - bool duplicate = false; - tree name = get_attribute_name (attribute); - tree ns = get_attribute_namespace (attribute); - if (ns == NULL_TREE) - { - /* Some standard attributes may appear at most once in - each attribute list. Diagnose duplicates and remove - them from the list to avoid subsequent diagnostics - such as the more general one for multiple - "fallthrough" attributes in the same place (including - in separate attribute lists in the same attribute - specifier sequence, which is not a constraint - violation). */ - if (is_attribute_p ("deprecated", name)) - { - if (seen_deprecated) - { - error ("attribute %<deprecated%> can appear at most " - "once in an attribute-list"); - duplicate = true; - } - seen_deprecated = true; - } - else if (is_attribute_p ("fallthrough", name)) - { - if (seen_fallthrough) - { - error ("attribute %<fallthrough%> can appear at most " - "once in an attribute-list"); - duplicate = true; - } - seen_fallthrough = true; - } - else if (is_attribute_p ("maybe_unused", name)) - { - if (seen_maybe_unused) - { - error ("attribute %<maybe_unused%> can appear at most " - "once in an attribute-list"); - duplicate = true; - } - seen_maybe_unused = true; - } - } - if (!duplicate) - { - TREE_CHAIN (attribute) = attributes; - attributes = attribute; - } + TREE_CHAIN (attribute) = attributes; + attributes = attribute; } if (c_parser_next_token_is_not (parser, CPP_COMMA)) break; |