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

re PR c++/41127 (unnamed bitfield declaration parser regression)

Browse source 
PR c++/41127
	* parser.c (cp_parser_enum_specifier): Make sure the : is followed by a
	type-specifier-seq before we commit.

From-SVN: r151246
This commit is contained in:
Jason Merrill 2009-08-31 17:08:33 -04:00 • committed by Jason Merrill
parent e74f1cc83c
commit c8affb455c
5 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-08-31 Jason Merrill <jason@redhat.com>
PR c++/41127
* parser.c (cp_parser_enum_specifier): Make sure the : is followed by a
type-specifier-seq before we commit.
2009-08-28 Richard Guenther <rguenther@suse.de>
PR lto/41058

17
gcc/cp/parser.c
View file

@ -11967,11 +11967,19 @@ cp_parser_enum_specifier (cp_parser* parser)
else
identifier = make_anon_name ();
/* Check for the `:' that denotes a specified underlying type in C++0x. */
/* Check for the `:' that denotes a specified underlying type in C++0x.
Note that a ':' could also indicate a bitfield width, however. */
if (cp_lexer_next_token_is (parser->lexer, CPP_COLON))
{
cp_decl_specifier_seq type_specifiers;
/* Consume the `:'. */
cp_lexer_consume_token (parser->lexer);
/* Parse the type-specifier-seq. */
cp_parser_type_specifier_seq (parser, /*is_condition=*/false,
&type_specifiers);
/* At this point this is surely not elaborated type specifier. */
if (!cp_parser_parse_definitely (parser))
return NULL_TREE;
@ -11979,15 +11987,8 @@ cp_parser_enum_specifier (cp_parser* parser)
if (cxx_dialect == cxx98)
maybe_warn_cpp0x ("scoped enums");
/* Consume the `:'. */
cp_lexer_consume_token (parser->lexer);
has_underlying_type = true;
/* Parse the type-specifier-seq. */
cp_parser_type_specifier_seq (parser, /*is_condition=*/false,
&type_specifiers);
/* If that didn't work, stop. */
if (type_specifiers.type != error_mark_node)
{

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2009-08-31 Jason Merrill <jason@redhat.com>
PR c++/41127
* g++.dg/parse/enum5.C: New.
* g++.dg/cpp0x/enum1.C: Adjust expected error.
2009-08-31 Janus Weil <janus@gcc.gnu.org>
PR fortran/40940

2
gcc/testsuite/g++.dg/cpp0x/enum1.C
View file

@ -2,5 +2,5 @@
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
enum : { }; // { dg-error "expected type-specifier" }
enum : { }; // { dg-error "expected" }
enum : 3 { }; // { dg-error "expected" }

17
gcc/testsuite/g++.dg/parse/enum5.C Normal file
View file

@ -0,0 +1,17 @@
// PR c++/41127
#define CHAR_BIT 8
enum EE {ee};
typedef unsigned int T;
struct D {
T : sizeof(unsigned int) * CHAR_BIT; // OK
EE : sizeof(EE) * CHAR_BIT; // OK
enum EE : sizeof(EE) * CHAR_BIT; // not OK
enum EE xxxx : sizeof(EE) * CHAR_BIT; // OK
T x : sizeof(unsigned int) * CHAR_BIT; // OK
enum FF {ff} : sizeof(int) * CHAR_BIT; // OK
} element;
enum EE xx;
EE yy;