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

re PR c++/77791 (ICE on invalid C++11 code with redefined function parameter: tree check: expected tree that contains ‘decl minimal’ structure, have ‘error_mark’ in cp_parser_lambda_declarator_opt, at cp/parser.c:1011) 

PR c++/77791
	* parser.c (cp_parser_lambda_declarator_opt): Only pedwarn
	for C++11 on decls in the param_list.  Test cxx_dialect < cxx14 before
	the loop just once.

	* g++.dg/cpp0x/lambda/lambda-77791.C: New test.

From-SVN: r240751
This commit is contained in:
Jakub Jelinek 2016-10-04 17:34:16 +02:00 committed by Jakub Jelinek
parent bfecd57cd4
commit f72da96757
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2016-10-04 Jakub Jelinek <jakub@redhat.com> 2016-10-04 Jakub Jelinek <jakub@redhat.com>
PR c++/77791
* parser.c (cp_parser_lambda_declarator_opt): Only pedwarn
for C++11 on decls in the param_list. Test cxx_dialect < cxx14 before
the loop just once.
* cp-tree.h (enum cp_tree_index): Remove CPTI_JAVA_*, * cp-tree.h (enum cp_tree_index): Remove CPTI_JAVA_*,
CPTI_LANG_NAME_JAVA and CPTI_JCLASS. CPTI_LANG_NAME_JAVA and CPTI_JCLASS.
(java_byte_type_node, java_short_type_node, java_int_type_node, (java_byte_type_node, java_short_type_node, java_int_type_node,

9
gcc/cp/parser.c
View File

@ -10114,10 +10114,11 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr)
/* Default arguments shall not be specified in the /* Default arguments shall not be specified in the
parameter-declaration-clause of a lambda-declarator. */ parameter-declaration-clause of a lambda-declarator. */
for (tree t = param_list; t; t = TREE_CHAIN (t)) if (cxx_dialect < cxx14)
if (TREE_PURPOSE (t) && cxx_dialect < cxx14) for (tree t = param_list; t; t = TREE_CHAIN (t))
pedwarn (DECL_SOURCE_LOCATION (TREE_VALUE (t)), OPT_Wpedantic, if (TREE_PURPOSE (t) && DECL_P (TREE_VALUE (t)))
"default argument specified for lambda parameter"); pedwarn (DECL_SOURCE_LOCATION (TREE_VALUE (t)), OPT_Wpedantic,
"default argument specified for lambda parameter");
cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN); cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2016-10-04 Jakub Jelinek <jakub@redhat.com> 2016-10-04 Jakub Jelinek <jakub@redhat.com>
PR c++/77791
* g++.dg/cpp0x/lambda/lambda-77791.C: New test.
* g++.dg/other/java3.C: Remove. * g++.dg/other/java3.C: Remove.
* g++.dg/other/java1.C: Remove. * g++.dg/other/java1.C: Remove.
* g++.dg/other/error12.C: Remove. * g++.dg/other/error12.C: Remove.

4
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-77791.C Normal file
View File

@ -0,0 +1,4 @@
// PR c++/77791
// { dg-do compile { target c++11 } }
auto a = [] (int i, int i = 0) {}; // { dg-error "redefinition of" }