procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle [[likely]] on compound-statement.

Browse source 
I overlooked this case when adding [[likely]] handling to
cp_parser_statement.

	* parser.c (cp_parser_statement): Handle [[likely]] on
	compound-statement.

From-SVN: r275978
This commit is contained in:
Jason Merrill 2019-09-19 15:41:17 -04:00 • committed by Jason Merrill
parent a519efbef8
commit e0710fcf7d
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2019-09-17 Jason Merrill <jason@redhat.com>
* parser.c (cp_parser_statement): Handle [[likely]] on
compound-statement.
2019-09-19 Jason Merrill <jason@redhat.com>
Revert:

5
gcc/cp/parser.c
View file

@ -11297,7 +11297,10 @@ cp_parser_statement (cp_parser* parser, tree in_statement_expr,
}
/* Anything that starts with a `{' must be a compound-statement. */
else if (token->type == CPP_OPEN_BRACE)
statement = cp_parser_compound_statement (parser, NULL, BCS_NORMAL, false);
{
std_attrs = process_stmt_hotness_attribute (std_attrs, attrs_loc);
statement = cp_parser_compound_statement (parser, NULL, BCS_NORMAL, false);
}
/* CPP_PRAGMA is a #pragma inside a function body, which constitutes
a statement all its own. */
else if (token->type == CPP_PRAGMA)

9
gcc/testsuite/g++.dg/cpp2a/attr-likely5.C Normal file
View file

@ -0,0 +1,9 @@
// { dg-do compile { target c++11 } }
void f(int i)
{
if (i) [[likely]]
{
++i;
}
}