diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/lambda-generic-const6.C | 18 |
3 files changed, 28 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f0545ae..6c474fd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-02-01 Jason Merrill <jason@redhat.com> + + PR c++/88761 - ICE with reference capture of constant. + * lambda.c (mark_const_cap_r): Do walk subtrees of DECL_EXPR for + non-proxy decls. + 2019-02-01 Marek Polacek <polacek@redhat.com> PR c++/88325 - ICE with invalid out-of-line template member definition. diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 4b7a358..c31b06e 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1488,8 +1488,10 @@ mark_const_cap_r (tree *t, int *walk_subtrees, void *data) { tree decl = DECL_EXPR_DECL (*t); if (is_constant_capture_proxy (decl)) - var = DECL_CAPTURED_VARIABLE (decl); - *walk_subtrees = 0; + { + var = DECL_CAPTURED_VARIABLE (decl); + *walk_subtrees = 0; + } } else if (is_constant_capture_proxy (*t)) var = DECL_CAPTURED_VARIABLE (*t); diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const6.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const6.C new file mode 100644 index 0000000..e85d649 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const6.C @@ -0,0 +1,18 @@ +// PR c++/88761 +// { dg-do compile { target c++14 } } + +template <class T> +void f(T t) { t(1); } + +int main() +{ + const unsigned long nf = 10'000'000; + + auto loop = [&](auto) + { + auto x = +nf; + auto y = &nf; + }; + + f(loop); +} |