mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 23:01:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Allow GNU attributes before lambda -> [PR90333]

Browse Source 
In my 9.3/10 patch for 90333 I allowed attributes between [] and (), and
after the trailing return type, but not in the place that GCC 8 expected
them, and we've gotten several bug reports about that.  So let's allow them
there, as well.

gcc/cp/ChangeLog:

	PR c++/90333
	* parser.c (cp_parser_lambda_declarator_opt): Accept GNU attributes
	between () and ->.

gcc/testsuite/ChangeLog:

	PR c++/90333
	* g++.dg/ext/attr-lambda3.C: New test.
This commit is contained in:
Jason Merrill 2021-02-26 05:45:02 -05:00
parent a938e4616d
commit 5d9d6c1cd8
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/cp/parser.c
View File

@ -11391,7 +11391,12 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr)
omitted_parms_loc = UNKNOWN_LOCATION;
}
std_attrs = cp_parser_std_attribute_spec_seq (parser);
/* GCC 8 accepted attributes here, and this is the place for standard C++11
attributes that appertain to the function type. */
if (cp_next_tokens_can_be_gnu_attribute_p (parser))
gnu_attrs = cp_parser_gnu_attributes_opt (parser);
else
std_attrs = cp_parser_std_attribute_spec_seq (parser);
/* Parse optional trailing return type. */
if (cp_lexer_next_token_is (parser->lexer, CPP_DEREF))
@ -11405,8 +11410,10 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr)
return_type = cp_parser_trailing_type_id (parser);
}
/* Also allow GNU attributes at the very end of the declaration, the usual
place for GNU attributes. */
if (cp_next_tokens_can_be_gnu_attribute_p (parser))
gnu_attrs = cp_parser_gnu_attributes_opt (parser);
gnu_attrs = chainon (gnu_attrs, cp_parser_gnu_attributes_opt (parser));
if (has_param_list)
{

4
gcc/testsuite/g++.dg/ext/attr-lambda3.C Normal file
View File

@ -0,0 +1,4 @@
// PR c++/90333
// { dg-do compile { target c++11 } }
auto x = []() __attribute__((always_inline)) -> int { return 0; }