PR c++/27270

	* typeck2.c (process_init_constructor_array): Reword comment.
	* pt.c (tsubst_copy_and_built): Call reshape_init before calling
	digest_init.
	PR c++/27270
	* g++.dg/ext/complit8.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117814 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ff47180..e603fd5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2006-10-16  Mark Mitchell  <mark@codesourcery.com>
 
+       PR c++/27270
+       * typeck2.c (process_init_constructor_array): Reword comment.
+       * pt.c (tsubst_copy_and_built): Call reshape_init before calling
+       digest_init.
+
        PR c++/29408
        * parser.c (cp_parser_using_declaration): Stop parsing when
        something goes wrong with an access declaration.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 744871f..ce5a809 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9351,7 +9351,10 @@ tsubst_copy_and_build (tree t,
        TREE_HAS_CONSTRUCTOR (r) = TREE_HAS_CONSTRUCTOR (t);
 
        if (type)
-         return digest_init (type, r);
+         {
+           r = reshape_init (type, r);
+           return digest_init (type, r);
+         }
        return r;
       }
 

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 6d847cb..725c85f 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -791,8 +791,8 @@ process_init_constructor_array (tree type, tree init)
     /* Vectors are like simple fixed-size arrays.  */
     len = TYPE_VECTOR_SUBPARTS (type);
 
-  /* There cannot be more initializers than needed (or reshape_init would
-     detect this before we do.  */
+  /* There cannot be more initializers than needed as otherwise
+     reshape_init would have already rejected the initializer.  */
   if (!unbounded)
     gcc_assert (VEC_length (constructor_elt, v) <= len);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3bf1718..603cbed 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-16  Mark Mitchell  <mark@codesourcery.com>
 
+       PR c++/27270
+       * g++.dg/ext/complit8.C: New test.
+
        PR c++/29408
        * g++.dg/parse/dtor12.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/ext/complit8.C b/gcc/testsuite/g++.dg/ext/complit8.C
new file mode 100644 (file)
index 0000000..b778b4b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/complit8.C
@@ -0,0 +1,12 @@
+// PR c++/27270
+// { dg-options "" }
+
+template<typename Entry>
+struct Array {
+  Entry *array[32];
+  Array () :
+    array ( (Entry*[1]) { 0, 0 } ) // { dg-error "initializers|conversion" }
+  {}
+};
+
+Array<void*> a;