diff options
| author | Jason Merrill <jason@redhat.com> | 2010-03-26 17:39:48 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-03-26 17:39:48 -0400 |
| commit | c6cc83d0c956ff38234275106c582edac67d3e39 (patch) | |
| tree | 283a2f977dca6f87bfaacc7659ae3cafb65b8a44 /gcc | |
| parent | 2155f963b3a8465593767a7fc189171e47350532 (diff) | |
| download | gcc-c6cc83d0c956ff38234275106c582edac67d3e39.zip gcc-c6cc83d0c956ff38234275106c582edac67d3e39.tar.gz gcc-c6cc83d0c956ff38234275106c582edac67d3e39.tar.bz2 | |
re PR c++/43509 ([C++0x] ICE in constructor_name_p, at cp/name-lookup.c:1809)
PR c++/43509
* parser.c (cp_parser_qualifying_entity): Do accept enum names in
c++0x mode, but not other type-names.
From-SVN: r157765
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/parse1.C | 5 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 81e9772..d790bfd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-03-26 Jason Merrill <jason@redhat.com> + + PR c++/43509 + * parser.c (cp_parser_qualifying_entity): Do accept enum names in + c++0x mode, but not other type-names. + 2010-03-26 Dodji Seketeli <dodji@redhat.com> PR c++/43327 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 41982f7..693d6cd 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -4441,6 +4441,16 @@ cp_parser_qualifying_entity (cp_parser *parser, /* Parse a typedef-name or enum-name. */ scope = cp_parser_nonclass_name (parser); + + /* "If the name found does not designate a namespace or a class, + enumeration, or dependent type, the program is ill-formed." + + We cover classes and dependent types above and namespaces below, + so this code is only looking for enums. */ + if (!scope || TREE_CODE (scope) != TYPE_DECL + || TREE_CODE (TREE_TYPE (scope)) != ENUMERAL_TYPE) + cp_parser_simulate_error (parser); + successful_parse_p = cp_parser_parse_definitely (parser); } /* If that didn't work, try for a namespace-name. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c61e37c..3ed0e1c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-26 Jason Merrill <jason@redhat.com> + + PR c++/43509 + * g++.dg/cpp0x/parse1.C: New. + 2010-03-26 Uros Bizjak <ubizjak@gmail.com> PR target/43524 diff --git a/gcc/testsuite/g++.dg/cpp0x/parse1.C b/gcc/testsuite/g++.dg/cpp0x/parse1.C new file mode 100644 index 0000000..4181185 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/parse1.C @@ -0,0 +1,5 @@ +// PR c++/43509 +// { dg-options "-std=c++0x" } + +typedef int B; // { dg-error "" } +B::B() {} // { dg-error "" } |