diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-02-20 09:02:12 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-02-20 09:02:12 +0000 |
| commit | 0b2513e292a70d715affbe4a9b5af6672fcf99b3 (patch) | |
| tree | 71703ff66974d7a3c883c1170d86827cc4b1b189 | |
| parent | 393d9df7b33313418ae8921cdb587537bd641c1c (diff) | |
| download | gcc-0b2513e292a70d715affbe4a9b5af6672fcf99b3.zip gcc-0b2513e292a70d715affbe4a9b5af6672fcf99b3.tar.gz gcc-0b2513e292a70d715affbe4a9b5af6672fcf99b3.tar.bz2 | |
re PR c++/84446 (ICE with broken lambda)
/cp
2018-02-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84446
* parser.c (cp_parser_init_declarator): Don't call start_lambda_scope
on error_mark_node.
/testsuite
2018-02-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84446
* g++.dg/cpp0x/lambda/lambda-ice27.C: New.
From-SVN: r257841
| -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/cpp0x/lambda/lambda-ice27.C | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1e0f9eb..f2bcce9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-20 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84446 + * parser.c (cp_parser_init_declarator): Don't call start_lambda_scope + on error_mark_node. + 2018-02-20 Jakub Jelinek <jakub@redhat.com> PR c++/84445 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index d8d7880..2bb0d2d 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -19650,12 +19650,12 @@ cp_parser_init_declarator (cp_parser* parser, member templates. The former involves deferring parsing of the initializer until end of class as with default arguments. So right here we only handle the latter. */ - if (!member_p && processing_template_decl) + if (!member_p && processing_template_decl && decl != error_mark_node) start_lambda_scope (decl); initializer = cp_parser_initializer (parser, &is_direct_init, &is_non_constant_init); - if (!member_p && processing_template_decl) + if (!member_p && processing_template_decl && decl != error_mark_node) finish_lambda_scope (); if (initializer == error_mark_node) cp_parser_skip_to_end_of_statement (parser); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 29157ac..6a0c3bd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-20 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84446 + * g++.dg/cpp0x/lambda/lambda-ice27.C: New. + 2018-02-20 Jakub Jelinek <jakub@redhat.com> PR c++/84445 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice27.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice27.C new file mode 100644 index 0000000..04c44a3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice27.C @@ -0,0 +1,8 @@ +// PR c++/84446 +// { dg-do compile { target c++11 } } + +template<int> void foo() +{ + int i, + i = [] { virtual }(); // { dg-error "redeclaration|expected" } +} |