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

re PR c++/69658 (Bogus "C99 designator outside aggregate initializer" error) 

PR c++/69658
	* init.c (expand_default_init): Only call reshape_init
	in the direct-initialization from an initializer list case.

	* g++.dg/init/pr69658.C: New test.

From-SVN: r233435
This commit is contained in:
Jakub Jelinek 2016-02-15 23:05:12 +01:00 committed by Jakub Jelinek
parent ba6b3795d4
commit f0516ca404
4 changed files with 20 additions and 4 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 @@
2016-02-15 Jakub Jelinek <jakub@redhat.com>
PR c++/69658
* init.c (expand_default_init): Only call reshape_init
in the direct-initialization from an initializer list case.
2016-02-15 Jason Merrill <jason@redhat.com>
PR c++/69753

9
gcc/cp/init.c
View File

@ -1636,16 +1636,17 @@ expand_default_init (tree binfo, tree true_exp, tree exp, tree init, int flags,
gcc_checking_assert ((flags & LOOKUP_ONLYCONVERTING) == 0
&& TREE_CHAIN (init) == NULL_TREE);
init = TREE_VALUE (init);
/* Only call reshape_init if it has not been called earlier
by the callers. */
if (BRACE_ENCLOSED_INITIALIZER_P (init) && CP_AGGREGATE_TYPE_P (type))
init = reshape_init (type, init, complain);
}
if (init && BRACE_ENCLOSED_INITIALIZER_P (init)
&& CP_AGGREGATE_TYPE_P (type))
/* A brace-enclosed initializer for an aggregate. In C++0x this can
happen for direct-initialization, too. */
{
init = reshape_init (type, init, complain);
init = digest_init (type, init, complain);
}
init = digest_init (type, init, complain);
/* A CONSTRUCTOR of the target's type is a previously digested
initializer, whether that happened just above or in

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2016-02-15 Jakub Jelinek <jakub@redhat.com>
PR c++/69658
* g++.dg/init/pr69658.C: New test.
PR c++/69797
* c-c++-common/pr69797.c: New test.

6
gcc/testsuite/g++.dg/init/pr69658.C Normal file
View File

@ -0,0 +1,6 @@
// PR c++/69658
// { dg-do compile }
struct S { S (int); };
struct T { char n[6]; S s; };
T t[1] = { { "foo", 1 } }; // { dg-bogus "C99 designator" }