git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR c++/70781 - ICE on ill-formed lambda. 

* parser.c (cp_parser_lambda_expression): Unset OK if there was an
	error parsing the lambda-declarator.

From-SVN: r238563
This commit is contained in:
Jason Merrill 2016-07-21 02:05:58 -04:00 committed by Jason Merrill
parent dd5dda561e
commit 172f0e1311
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2016-07-21 Jason Merrill <jason@redhat.com> 2016-07-21 Jason Merrill <jason@redhat.com>
PR c++/70781
* parser.c (cp_parser_lambda_expression): Unset OK if there was an
error parsing the lambda-declarator.
PR c++/71896 PR c++/71896
* constexpr.c (cxx_eval_binary_expression): Handle comparison * constexpr.c (cxx_eval_binary_expression): Handle comparison
between lowered and unlowered PTRMEM_CST. between lowered and unlowered PTRMEM_CST.

6
gcc/cp/parser.c
View File

@ -9771,10 +9771,12 @@ cp_parser_lambda_expression (cp_parser* parser)
ok &= cp_parser_lambda_declarator_opt (parser, lambda_expr); ok &= cp_parser_lambda_declarator_opt (parser, lambda_expr);
if (ok && cp_parser_error_occurred (parser))
ok = false;
if (ok) if (ok)
{ {
if (!cp_parser_error_occurred (parser) if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)
&& cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)
&& cp_parser_start_tentative_firewall (parser)) && cp_parser_start_tentative_firewall (parser))
start = token; start = token;
cp_parser_lambda_body (parser, lambda_expr); cp_parser_lambda_body (parser, lambda_expr);

8
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice16.C Normal file
View File

@ -0,0 +1,8 @@
// PR c++/70781
// { dg-do compile { target c++11 } }
template < typename T >
void foo ()
{
T ([=] (S) { [=] {}; }); // { dg-error "" }
}