diff options
| author | Adam Butcher <adam@jessamine.co.uk> | 2014-03-08 09:33:03 +0000 |
|---|---|---|
| committer | Adam Butcher <abutcher@gcc.gnu.org> | 2014-03-08 09:33:03 +0000 |
| commit | 14e62702520cd5fc0907e1d777ee1ae6dfabd582 (patch) | |
| tree | a6678262c6c2efdbb57c446e8cc7c23f56d12783 /gcc/cp | |
| parent | bd65fc87824ef69e69c6e79cd1323b43b77e0866 (diff) | |
| download | gcc-14e62702520cd5fc0907e1d777ee1ae6dfabd582.zip gcc-14e62702520cd5fc0907e1d777ee1ae6dfabd582.tar.gz gcc-14e62702520cd5fc0907e1d777ee1ae6dfabd582.tar.bz2 | |
re PR c++/60393 ([c++1y] ICE with with invalid functions with auto parameters)
Fix PR c++/60393
PR c++/60393
* parser.c (cp_parser_parameter_declaration_clause): Move generic
function template unwinding on error into a more general location, ...
(cp_parser_skip_to_end_of_statement): ... here.
PR c++/60393
* g++.dg/cpp1y/pr60393.C: New testcase.
From-SVN: r208426
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 83a3585..07ac2b2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-03-08 Adam Butcher <adam@jessamine.co.uk> + + PR c++/60393 + * parser.c (cp_parser_parameter_declaration_clause): Move generic + function template unwinding on error into a more general location, ... + (cp_parser_skip_to_end_of_statement): ... here. + 2014-03-07 Jason Merrill <jason@redhat.com> * Make-lang.in (check_g++_parallelize): Split dg.exp. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5725283..64583ba 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3136,6 +3136,10 @@ cp_parser_skip_to_end_of_statement (cp_parser* parser) { unsigned nesting_depth = 0; + /* Unwind generic function template scope if necessary. */ + if (parser->fully_implicit_function_template_p) + finish_fully_implicit_template (parser, /*member_decl_opt=*/0); + while (true) { cp_token *token = cp_lexer_peek_token (parser->lexer); @@ -18242,12 +18246,7 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) parameter-declaration-list, then the entire parameter-declaration-clause is erroneous. */ if (is_error) - { - /* Unwind generic function template scope if necessary. */ - if (parser->fully_implicit_function_template_p) - finish_fully_implicit_template (parser, /*member_decl_opt=*/0); - return NULL; - } + return NULL; /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); |