OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/56567 (ICE with lambda return type deduction and braced-init-list) 

PR c++/56567
	* typeck.c (check_return_expr): Disallow returning init list here.
	* semantics.c (apply_deduced_return_type): Not here.

From-SVN: r196600
This commit is contained in:
Jason Merrill 2013-03-11 12:22:16 -04:00 committed by Jason Merrill
parent a036a589fa
commit 2aa953d015
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2013-03-11 Jason Merrill <jason@redhat.com>
PR c++/56567
* typeck.c (check_return_expr): Disallow returning init list here.
* semantics.c (apply_deduced_return_type): Not here.
2013-03-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51412

6
gcc/cp/semantics.c
View File

@ -9061,12 +9061,6 @@ apply_deduced_return_type (tree fco, tree return_type)
if (return_type == error_mark_node)
return;
if (is_std_init_list (return_type))
{
error ("returning %qT", return_type);
return_type = void_type_node;
}
if (LAMBDA_FUNCTION_P (fco))
{
tree lambda = CLASSTYPE_LAMBDA_EXPR (current_class_type);

5
gcc/cp/typeck.c
View File

@ -8136,6 +8136,11 @@ check_return_expr (tree retval, bool *no_warning)
"deduced to %<void%>");
type = error_mark_node;
}
else if (retval && BRACE_ENCLOSED_INITIALIZER_P (retval))
{
error ("returning initializer list");
type = error_mark_node;
}
else
{
if (!retval)

2
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist3.C
View File

@ -5,7 +5,7 @@
int main()
{
[]{ return { 1, 2 }; }(); // { dg-error "initializer_list" }
[]{ return { 1, 2 }; }(); // { dg-error "initializer.list" }
}
// { dg-prune-output "return-statement with a value" }