PR c++/26884

        * typeck2.c (digest_init): Raise error upon attempts to
        initialize arrays with variables.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2358e9b..356bc25 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-18  Mark Shinwell  <shinwell@codesourcery.com>
+
+       PR c++/26884
+       * typeck2.c (digest_init): Raise error upon attempts to
+       initialize arrays with variables.
+
 2006-10-17  Lee Millward  <lee.millward@codesourcery.com> 
 
         PR c++/27952

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 12987cf..a3654c0 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -733,6 +733,15 @@ digest_init (tree type, tree init)
 
          return error_mark_node;
        }
+
+      if (TREE_CODE (type) == ARRAY_TYPE
+         && TREE_CODE (init) != CONSTRUCTOR)
+       {
+         error ("array must be initialized with a brace-enclosed"
+                " initializer");
+         return error_mark_node;
+       }
+
       return convert_for_initialization (NULL_TREE, type, init,
                                         LOOKUP_NORMAL | LOOKUP_ONLYCONVERTING,
                                         "initialization", NULL_TREE, 0);