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

re PR c++/58812 (ICE initializing an r-value reference with an initializer list)

Browse Source 
PR c++/58812
	* call.c (convert_like_real): Give helpful error about excess braces
	for ck_rvalue of scalar type.

From-SVN: r207165
This commit is contained in:
Jason Merrill 2014-01-27 23:31:01 -05:00 committed by Jason Merrill
parent f235ad118f
commit 110740003a
4 changed files with 34 additions and 5 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 @@
2014-01-27 Jason Merrill <jason@redhat.com>
PR c++/58812
PR c++/58651
* call.c (convert_like_real): Give helpful error about excess braces
for ck_rvalue of scalar type.
Core DR 1288
* call.c (reference_binding): Only elide braces if the single
element is reference-related.

19
gcc/cp/call.c
View File

@ -5879,9 +5879,11 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
&& convs->kind != ck_ambig
&& (convs->kind != ck_ref_bind
|| convs->user_conv_p)
&& convs->kind != ck_rvalue
&& (convs->kind != ck_rvalue
|| SCALAR_TYPE_P (totype))
&& convs->kind != ck_base)
{
bool complained = false;
conversion *t = convs;
/* Give a helpful error if this is bad because of excess braces. */
@ -5889,7 +5891,13 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
&& SCALAR_TYPE_P (totype)
&& CONSTRUCTOR_NELTS (expr) > 0
&& BRACE_ENCLOSED_INITIALIZER_P (CONSTRUCTOR_ELT (expr, 0)->value))
permerror (loc, "too many braces around initializer for %qT", totype);
{
complained = permerror (loc, "too many braces around initializer "
"for %qT", totype);
while (BRACE_ENCLOSED_INITIALIZER_P (expr)
&& CONSTRUCTOR_NELTS (expr) == 1)
expr = CONSTRUCTOR_ELT (expr, 0)->value;
}
for (; t ; t = next_conversion (t))
{
@ -5925,9 +5933,10 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
else if (t->kind == ck_identity)
break;
}
if (permerror (loc, "invalid conversion from %qT to %qT",
TREE_TYPE (expr), totype)
&& fn)
if (!complained)
complained = permerror (loc, "invalid conversion from %qT to %qT",
TREE_TYPE (expr), totype);
if (complained && fn)
inform (DECL_SOURCE_LOCATION (fn),
"initializing argument %P of %qD", argnum, fn);

5
gcc/testsuite/g++.dg/cpp0x/initlist76.C Normal file
View File

@ -0,0 +1,5 @@
// PR c++/58812
// { dg-require-effective-target c++11 }
int i;
int&& j{{ i }}; // { dg-error "too many braces" }

10
gcc/testsuite/g++.dg/cpp0x/initlist77.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/58651
// { dg-require-effective-target c++11 }
struct A
{
int i;
A(int j) : i{{j}} {} // { dg-error "too many braces" }
};
A a(0);