c++: Don't allow defining types in enum-base [PR96380]
In r11-2064 I made cp_parser_enum_specifier commit to tentative parse when seeing a '{'. That still looks like the correct thing to do, but it caused an ICE-on-invalid as well as accepts-invalid. When we have something sneaky like this, which is broken in multiple ways: template <class> enum struct c : union enum struct c { e = b, f = a }; we parse the "enum struct c" part (that's OK) and then we see that we have an enum-base, so we consume ':' and then parse the type-specifier that follows the :. "union enum" is clearly invalid, but we're still parsing tentatively and we parse everything up to the ;, and then throw away the underlying type. We parsed everything because we were tricked into parsing an enum-specifier in an enum-base of another enum-specifier! Not good. Since the grammar for enum-base doesn't allow a defining-type-specifier, only a type-specifier, we should set type_definition_forbidden_message which fixes all the problems in this PR. gcc/cp/ChangeLog: PR c++/96380 * parser.c (cp_parser_enum_specifier): Don't allow defining types in enum-base. gcc/testsuite/ChangeLog: PR c++/96380 * g++.dg/cpp0x/enum_base4.C: New test. * g++.dg/cpp0x/enum_base5.C: New test.
This commit is contained in:
parent
e9fc9d075f
commit
001c63d15e
3 changed files with 19 additions and 0 deletions
|
@ -19942,6 +19942,10 @@ cp_parser_enum_specifier (cp_parser* parser)
|
|||
/* Consume the `:'. */
|
||||
cp_lexer_consume_token (parser->lexer);
|
||||
|
||||
auto tdf
|
||||
= make_temp_override (parser->type_definition_forbidden_message,
|
||||
G_("types may not be defined in enum-base"));
|
||||
|
||||
/* Parse the type-specifier-seq. */
|
||||
cp_parser_type_specifier_seq (parser, CP_PARSER_FLAGS_NONE,
|
||||
/*is_declaration=*/false,
|
||||
|
|
8
gcc/testsuite/g++.dg/cpp0x/enum_base4.C
Normal file
8
gcc/testsuite/g++.dg/cpp0x/enum_base4.C
Normal file
|
@ -0,0 +1,8 @@
|
|||
// PR c++/96380
|
||||
// { dg-do compile { target c++11 } }
|
||||
|
||||
extern const int a, b;
|
||||
enum struct c;
|
||||
template <class>
|
||||
enum struct c : union enum struct c { e = b, f = a }; // { dg-error "types may not be defined|expected|elaborated-type-specifier" }
|
||||
enum class c {};
|
7
gcc/testsuite/g++.dg/cpp0x/enum_base5.C
Normal file
7
gcc/testsuite/g++.dg/cpp0x/enum_base5.C
Normal file
|
@ -0,0 +1,7 @@
|
|||
// PR c++/96380
|
||||
// { dg-do compile { target c++11 } }
|
||||
|
||||
extern const int a, b;
|
||||
enum struct c;
|
||||
template <class>
|
||||
enum struct c : union enum struct c { e = b, f = a }; // { dg-error "types may not be defined|expected|elaborated-type-specifier" }
|
Loading…
Add table
Reference in a new issue