mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 06:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

DR 1467 PR c++/51747

Browse Source 
DR 1467
	PR c++/51747
	* typeck2.c (digest_init_r): Fix single element list.

From-SVN: r222881
This commit is contained in:
Jason Merrill 2015-05-07 12:46:49 -04:00 committed by Jason Merrill
parent a3facd7c6c
commit d5449acf6b
3 changed files with 24 additions and 0 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 @@
2015-05-07 Jason Merrill <jason@redhat.com>
DR 1467
PR c++/51747
* typeck2.c (digest_init_r): Fix single element list.
2015-05-05 Jason Merrill <jason@redhat.com>
* cp-gimplify.c (cp_genericize_r): Track TRY_BLOCK and

13
gcc/cp/typeck2.c
View File

@ -1096,6 +1096,19 @@ digest_init_r (tree type, tree init, bool nested, int flags,
|| TREE_CODE (type) == UNION_TYPE
|| TREE_CODE (type) == COMPLEX_TYPE);
/* "If T is a class type and the initializer list has a single
element of type cv U, where U is T or a class derived from T,
the object is initialized from that element." */
if (cxx_dialect >= cxx11
&& BRACE_ENCLOSED_INITIALIZER_P (init)
&& CONSTRUCTOR_NELTS (init) == 1
&& (CLASS_TYPE_P (type) || VECTOR_TYPE_P (type)))
{
tree elt = CONSTRUCTOR_ELT (init, 0)->value;
if (reference_related_p (type, TREE_TYPE (elt)))
init = elt;
}
if (BRACE_ENCLOSED_INITIALIZER_P (init)
&& !TYPE_NON_AGGREGATE_CLASS (type))
return process_init_constructor (type, init, complain);

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

@ -0,0 +1,5 @@
// PR c++/51747
// { dg-do compile { target c++11 } }
struct B {};
struct D : B {D(B b) : B{b} {}};