diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-11-15 13:18:09 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-11-15 13:18:09 +0000 |
| commit | d46b9539e69f8b183765c93a432a2e027adb7036 (patch) | |
| tree | 11000c7700a2d61a46ce3a7e455d12e6a4694c66 | |
| parent | cf7b71bf0341e5fc0cb04c911ffc539b59d7db78 (diff) | |
| download | gcc-d46b9539e69f8b183765c93a432a2e027adb7036.tar.gz | |
[PR c++/81574] lambda capture of function reference
https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01200.html
PR c++/81574
* lambda.c (lambda_capture_field_type): Function references are
always catured by reference.
PR c++/81574
* g++.dg/cpp1y/pr81574.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254768 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/pr81574.C | 13 |
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 839042e48c6..e8c882f2253 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-11-15 Nathan Sidwell <nathan@acm.org> + + PR c++/81574 + * lambda.c (lambda_capture_field_type): Function references are + always catured by reference. + 2017-11-15 Martin Liska <mliska@suse.cz> * decl.c (begin_destructor_body): Use cp_build_fold_indirect_ref diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 2cbad878ff6..4480c67dc5f 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -245,7 +245,8 @@ lambda_capture_field_type (tree expr, bool explicit_init_p, { type = non_reference (unlowered_expr_type (expr)); - if (!is_this && by_reference_p) + if (!is_this + && (by_reference_p || TREE_CODE (type) == FUNCTION_TYPE)) type = build_reference_type (type); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1dada439faf..8478a7a88f2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-15 Nathan Sidwell <nathan@acm.org> + + PR c++/81574 + * g++.dg/cpp1y/pr81574.C: New. + 2017-11-15 Richard Biener <rguenther@suse.de> PR tree-optimization/82985 diff --git a/gcc/testsuite/g++.dg/cpp1y/pr81574.C b/gcc/testsuite/g++.dg/cpp1y/pr81574.C new file mode 100644 index 00000000000..f9949ab90e9 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr81574.C @@ -0,0 +1,13 @@ +// { dg-do compile { target c++14 } } +// PR c++/81574 references to functions are captured by reference. + +// 8.1.5.2/10 +// For each entity captured by copy, ... an lvalue reference to the +// referenced function type if the entity is a reference to a function + +void f (void (&b)()) +{ + [=] { b; } (); + [=, b(f)] { b; } (); + [=, b(b)] { b; } (); +} |