diff options
| author | Adam Butcher <adam@jessamine.co.uk> | 2014-03-17 20:02:16 +0000 |
|---|---|---|
| committer | Adam Butcher <abutcher@gcc.gnu.org> | 2014-03-17 20:02:16 +0000 |
| commit | c66f2ba1ba6bf0b3ca6b092ee964461d6c7bb93f (patch) | |
| tree | 9d8916b55e3777508dc8d964f0ac58fdb4fd4650 /gcc | |
| parent | e318c1e15dd56380235bae7b7eea41301ff5e931 (diff) | |
| download | gcc-c66f2ba1ba6bf0b3ca6b092ee964461d6c7bb93f.zip gcc-c66f2ba1ba6bf0b3ca6b092ee964461d6c7bb93f.tar.gz gcc-c66f2ba1ba6bf0b3ca6b092ee964461d6c7bb93f.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/pr60391.C | 10 |
4 files changed, 25 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5b52060..a240ad9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-17 Adam Butcher <adam@jessamine.co.uk> + + 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 <paolo.carlini@oracle.com> PR c++/59571 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index a3c8d7e..519e209 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 e887fb19..a327e94 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-17 Adam Butcher <adam@jessamine.co.uk> + + PR c++/60391 + * g++.dg/cpp1y/pr60391.C: New testcase. + 2014-03-17 Jakub Jelinek <jakub@redhat.com> 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 0000000..68746ae --- /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 {} |