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

re PR c++/33510 (Array size of array with size determined by the initializer wrong with packs)

Browse Source 
2007-11-09  Douglas Gregor  <doug.gregor@gmail.com>

	PR c++/33510
	* decl.c (cp_complete_array_type): If any of the initializer
	elements are pack expansions, don't compute the array size yet.

2007-11-09  Douglas Gregor  <doug.gregor@gmail.com>

	PR c++/33510
	* g++.dg/cpp0x/variadic-init.C: New.

From-SVN: r130065
This commit is contained in:
Douglas Gregor 2007-11-10 02:53:31 +00:00 committed by Doug Gregor
parent a4d60af8e9
commit 49b5e2f6b5
4 changed files with 83 additions and 1 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 @@
2007-11-09 Douglas Gregor <doug.gregor@gmail.com>
PR c++/33510
* decl.c (cp_complete_array_type): If any of the initializer
elements are pack expansions, don't compute the array size yet.
2007-11-08 Andrew Pinski <pinskia@gmail.com>
PR c++/30297:

17
gcc/cp/decl.c
View File

@ -4331,7 +4331,7 @@ maybe_deduce_size_from_array_init (tree decl, tree init)
HOST_WIDE_INT i;
for (i = 0;
VEC_iterate (constructor_elt, v, i, ce);
++i)
++i)
if (!check_array_designated_initializer (ce))
failure = 1;
}
@ -6110,6 +6110,9 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default)
if (initial_value)
{
unsigned HOST_WIDE_INT i;
tree value;
/* An array of character type can be initialized from a
brace-enclosed string constant.
@ -6126,6 +6129,18 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default)
&& VEC_length (constructor_elt, v) == 1)
initial_value = value;
}
/* If any of the elements are parameter packs, we can't actually
complete this type now because the array size is dependent. */
if (TREE_CODE (initial_value) == CONSTRUCTOR)
{
FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (initial_value),
i, value)
{
if (PACK_EXPANSION_P (value))
return 0;
}
}
}
failure = complete_array_type (ptype, initial_value, do_default);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-09 Douglas Gregor <doug.gregor@gmail.com>
PR c++/33510
* g++.dg/cpp0x/variadic-init.C: New.
2007-11-09 Paolo Bonzini <bonzini@gnu.org>
Jakub Jelinek <jakub@redhat.com>

56
gcc/testsuite/g++.dg/cpp0x/variadic-init.C Normal file
View File

@ -0,0 +1,56 @@
// { dg-do run }
// { dg-options "-std=gnu++0x" }
// PR c++/33510
#define SIZE_FROM_CTOR
extern "C" void abort ();
template<int M, int N> struct pair
{
int i, j;
pair () : i (M), j (N) {}
};
template<int... M> struct S
{
template<int... N> static int *foo ()
{
#ifdef SIZE_FROM_CTOR
static int x[] = { (M + N)..., -1 };
#else
static int x[1 + sizeof... N] = { (M + N)..., -1 };
#endif
return x;
}
};
template<typename... M> struct R
{
template<typename... N> static int *foo ()
{
#ifdef SIZE_FROM_CTOR
static int x[] = { (sizeof(M) + sizeof(N))..., -1 };
#else
static int x[1 + sizeof... N] = { (sizeof(M) + sizeof(N))..., -1 };
#endif
return x;
}
};
int *bar ()
{
return S<0, 1, 2>::foo<0, 1, 2> ();
}
int *baz ()
{
return R<char, short, int>::foo<float, double, long> ();
}
int main ()
{
int *p = bar ();
if (p[0] != 0 || p[1] != 2 || p[2] != 4 || p[3] != -1)
abort ();
}