summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2017-07-27 09:36:37 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2017-07-27 09:36:37 +0000
commitef82cd98fcd583725cf66468c3312ea0128bdf7c (patch)
tree0fe001e09bf17b295427101bfc835f62e60b2de6
parent32c40cebea5012e4b68f003834054fac76a7b389 (diff)
downloadgcc-ef82cd98fcd583725cf66468c3312ea0128bdf7c.tar.gz
/cp
2017-07-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/71570 * lambda.c (add_capture): Early return if we cannot capture by reference. /testsuite 2017-07-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/71570 * g++.dg/cpp0x/lambda/lambda-ice17.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250614 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/lambda.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice17.C12
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4e6e29b2da6..89da90b1d02 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-27 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/71570
+ * lambda.c (add_capture): Early return if we cannot capture by
+ reference.
+
2017-07-17 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 431823f7501..a9ddba83fc0 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -538,7 +538,10 @@ add_capture (tree lambda, tree id, tree orig_init, bool by_reference_p,
else if (id != this_identifier && by_reference_p)
{
if (!lvalue_p (initializer))
- error ("cannot capture %qE by reference", initializer);
+ {
+ error ("cannot capture %qE by reference", initializer);
+ return error_mark_node;
+ }
}
else
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2df71a87e75..bd2d32b645f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-27 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/71570
+ * g++.dg/cpp0x/lambda/lambda-ice17.C: New.
+
2017-07-27 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/81555
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice17.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice17.C
new file mode 100644
index 00000000000..57111fdef6a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice17.C
@@ -0,0 +1,12 @@
+// PR c++/71570
+// { dg-do compile { target c++11 } }
+
+void foo (int);
+
+void foo (void)
+{
+ [&foo] // { dg-error "cannot capture" }
+ {
+ foo (0);
+ };
+}