diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2015-10-12 11:55:19 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2015-10-12 11:55:19 +0300 |
| commit | 7624ca36a275ec0c86f6740b079dcc08215883bf (patch) | |
| tree | 1f4d6eff28e77c55180e3fe94d2ec975f135935b /gcc | |
| parent | 15f128a7193fe0724c9e1e4f0d6a015af7f1b97d (diff) | |
| download | gcc-7624ca36a275ec0c86f6740b079dcc08215883bf.zip gcc-7624ca36a275ec0c86f6740b079dcc08215883bf.tar.gz gcc-7624ca36a275ec0c86f6740b079dcc08215883bf.tar.bz2 | |
re PR c++/58566 ([c++11] ICE with invalid expression in lambda body)
PR c++/58566
/cp
2015-10-12 Ville Voutilainen <ville.voutilainen@gmail.com>
PR c++/58566
* lambda.c (lambda_return_type): Return error_mark_node
instead of void_type_node for the error cases.
/testsuite
2015-10-12 Ville Voutilainen <ville.voutilainen@gmail.com>
PR c++/58566
* g++.dg/cpp0x/lambda/lambda-58566.C: New.
From-SVN: r228706
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/cpp0x/lambda/lambda-58566.C | 10 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e89fd02..517ce52 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-10-12 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/58566 + * lambda.c (lambda_return_type): Return error_mark_node + instead of void_type_node for the error cases. + 2015-10-08 Jason Merrill <jason@redhat.com> * cp-tree.h (SIMPLE_TARGET_EXPR_P): New. diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index ceab646..b4f19af 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -175,7 +175,7 @@ lambda_return_type (tree expr) || BRACE_ENCLOSED_INITIALIZER_P (expr)) { cxx_incomplete_type_error (expr, TREE_TYPE (expr)); - return void_type_node; + return error_mark_node; } gcc_checking_assert (!type_dependent_expression_p (expr)); return cv_unqualified (type_decays_to (unlowered_expr_type (expr))); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b558a9e..f4b7d26 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-12 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/58566 + * g++.dg/cpp0x/lambda/lambda-58566.C: New. + 2015-10-10 Jan Hubicka <hubicka@ucw.cz> * gfortran.dg/lto/bind_c-2_0.f90: New testcase. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-58566.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-58566.C new file mode 100644 index 0000000..3101d0a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-58566.C @@ -0,0 +1,10 @@ +// PR c++/58566 +// { dg-do compile { target c++11 } } + +struct A +{ + int foo() + { + [this]{ return foo; }; // { dg-error "invalid use of member function|cannot convert" } + } +}; |