diff options
| author | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-08-21 18:37:23 +0000 |
|---|---|---|
| committer | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-08-21 18:37:23 +0000 |
| commit | 5019ff1206f377d309c24912f2ed43af340ece8f (patch) | |
| tree | 1eda2ec33c05aeb27bb7e881205a0ff36e5efab1 | |
| parent | 522a5d08473be38eb5171b2a4d3cf5e573128f29 (diff) | |
PR c++/86499
* parser.c (cp_parser_lambda_introducer): Give error if a non-local
lambda has a capture-default.
* g++.dg/cpp0x/lambda/lambda-non-local.C: New test.
* g++.dg/cpp0x/lambda/lambda-this10.C: Adjust dg-error.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263749 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-local.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this10.C | 2 |
5 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29f3fd86466..0fbd8167a04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-08-21 Marek Polacek <polacek@redhat.com> + + PR c++/86499 + * parser.c (cp_parser_lambda_introducer): Give error if a non-local + lambda has a capture-default. + 2018-08-21 Paolo Carlini <paolo.carlini@oracle.com> * decl.c (check_static_variable_definition): Change to return void. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index aa5286b24cc..49d476b383f 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10285,6 +10285,9 @@ cp_parser_lambda_introducer (cp_parser* parser, tree lambda_expr) { cp_lexer_consume_token (parser->lexer); first = false; + + if (!(at_function_scope_p () || parsing_nsdmi ())) + error ("non-local lambda expression cannot have a capture-default"); } while (cp_lexer_next_token_is_not (parser->lexer, CPP_CLOSE_SQUARE)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6c87f8017d3..b5ba160b6b3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -13,6 +13,10 @@ * g++.dg/cpp0x/Wnarrowing12.C: New test. * g++.dg/cpp0x/rv-cast5.C: Add static_cast. + PR c++/86499 + * g++.dg/cpp0x/lambda/lambda-non-local.C: New test. + * g++.dg/cpp0x/lambda/lambda-this10.C: Adjust dg-error. + 2018-08-21 Ed Schonberg <schonberg@adacore.com> * gnat.dg/expr_func7.adb, gnat.dg/expr_func7.ads: New testcase. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-local.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-local.C new file mode 100644 index 00000000000..005f8f3888b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-non-local.C @@ -0,0 +1,10 @@ +// PR c++/86499 +// { dg-do compile { target c++11 } } + +auto l1 = [=]{}; // { dg-error "non-local lambda expression cannot have a capture-default" } +auto l2 = [&]{}; // { dg-error "non-local lambda expression cannot have a capture-default" } + +namespace { + auto l3 = [=]{}; // { dg-error "non-local lambda expression cannot have a capture-default" } + auto l4 = [&]{}; // { dg-error "non-local lambda expression cannot have a capture-default" } +} diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this10.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this10.C index b4b8e7201aa..e8e94771ef0 100644 --- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this10.C +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this10.C @@ -1,4 +1,4 @@ // PR c++/54383 // { dg-do compile { target c++11 } } -auto foo = [&](int a) { return a > this->b; }; // { dg-error "this" } +auto foo = [&](int a) { return a > this->b; }; // { dg-error "non-local|this" } |