diff options
| author | Jason Merrill <jason@redhat.com> | 2014-03-04 17:16:03 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-03-04 17:16:03 -0500 |
| commit | 201fe4c608fea87610940f2e6329f2ae13157cee (patch) | |
| tree | 71e7f8070550a20f2a38a68e73afe9ab9aceeaaf /gcc | |
| parent | 0c72fa788da37c64a29963d28ab9524af6d98301 (diff) | |
| download | gcc-201fe4c608fea87610940f2e6329f2ae13157cee.zip gcc-201fe4c608fea87610940f2e6329f2ae13157cee.tar.gz gcc-201fe4c608fea87610940f2e6329f2ae13157cee.tar.bz2 | |
re PR c++/60415 (Bogus "invalid use of qualified-name")
PR c++/60415
PR c++/54359
* parser.c (cp_parser_direct_declarator): Set declarator to
cp_error_declarator on invalid qualified-id.
From-SVN: r208332
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/ambig8.C | 15 |
3 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0a12700..2ad6b7a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-03-04 Jason Merrill <jason@redhat.com> + + PR c++/60415 + PR c++/54359 + * parser.c (cp_parser_direct_declarator): Set declarator to + cp_error_declarator on invalid qualified-id. + 2014-03-04 Paolo Carlini <paolo.carlini@oracle.com> PR c++/60376 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 413ada6..bb7d268 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -17456,6 +17456,7 @@ cp_parser_direct_declarator (cp_parser* parser, /* But declarations with qualified-ids can't appear in a function. */ cp_parser_error (parser, "qualified-id in declaration"); + declarator = cp_error_declarator; break; } pushed_scope = push_scope (scope); diff --git a/gcc/testsuite/g++.dg/parse/ambig8.C b/gcc/testsuite/g++.dg/parse/ambig8.C new file mode 100644 index 0000000..016df8a --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/ambig8.C @@ -0,0 +1,15 @@ +// PR c++/60415 + +namespace b { + enum type_t { warning }; +} + +struct d { + d(b::type_t) { } + int operator()() { return 0; } +}; + +int main() +{ + d(b::warning)() + 1; +} |