From c66f2ba1ba6bf0b3ca6b092ee964461d6c7bb93f Mon Sep 17 00:00:00 2001 From: Adam Butcher Date: Mon, 17 Mar 2014 20:02:16 +0000 Subject: [PATCH] re PR c++/60391 ([c++1y] ICE with auto parameter for operator"") Fix PR c++/60391 PR c++/60391 * parser.c (cp_parser_skip_to_end_of_block_or_statement): Unwind generic function scope as per cp_parser_skip_to_end_of_statement. PR c++/60391 * g++.dg/cpp1y/pr60391.C: New testcase. From-SVN: r208624 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp1y/pr60391.C | 10 ++++++++++ 4 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr60391.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5b52060720e..a240ad9ec76 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-17 Adam Butcher + + PR c++/60391 + * parser.c (cp_parser_skip_to_end_of_block_or_statement): Unwind generic + function scope as per cp_parser_skip_to_end_of_statement. + 2014-03-17 Paolo Carlini PR c++/59571 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index a3c8d7ecb3f..519e2090dd2 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3225,6 +3225,10 @@ cp_parser_skip_to_end_of_block_or_statement (cp_parser* parser) { int 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 (nesting_depth >= 0) { cp_token *token = cp_lexer_peek_token (parser->lexer); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e887fb193af..a327e94bcd5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-17 Adam Butcher + + PR c++/60391 + * g++.dg/cpp1y/pr60391.C: New testcase. + 2014-03-17 Jakub Jelinek PR target/60516 diff --git a/gcc/testsuite/g++.dg/cpp1y/pr60391.C b/gcc/testsuite/g++.dg/cpp1y/pr60391.C new file mode 100644 index 00000000000..68746aedf39 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr60391.C @@ -0,0 +1,10 @@ +// PR c++/60391 +// { dg-do compile { target c++1y } } +// { dg-options "" } + +namespace N +{ + int operator"" _X(auto) {} // { dg-error "invalid" } +} + +namespace N {} -- 2.30.2