diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/lambda-ice1.C | 7 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ec690d..c295a85 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-08-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/72800 + * lambda.c (add_capture): Check lambda_capture_field_type return + value for error_mark_node. + 2016-08-04 Patrick Palka <ppalka@gcc.gnu.org> PR c++/72759 diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index abb967a..978fa0d 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -492,6 +492,8 @@ add_capture (tree lambda, tree id, tree orig_init, bool by_reference_p, else { type = lambda_capture_field_type (initializer, explicit_init_p); + if (type == error_mark_node) + return error_mark_node; if (by_reference_p) { type = build_reference_type (type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c456b18..5237b6a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/72800 + * g++.dg/cpp1y/lambda-ice1.C: New. + 2016-08-04 Patrick Palka <ppalka@gcc.gnu.org> PR c++/72759 diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-ice1.C b/gcc/testsuite/g++.dg/cpp1y/lambda-ice1.C new file mode 100644 index 0000000..86fb88a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-ice1.C @@ -0,0 +1,7 @@ +// PR c++/72800 +// { dg-do compile { target c++14 } } + +void foo () +{ + [n {}] {}; // { dg-error "one element|deducing" } +} |