decl.c (reshape_init): Convert array designator to sizetype.

	* decl.c (reshape_init): Convert array designator to sizetype.

	* g++.dg/parse/init1.C: New test.

From-SVN: r78273

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6420993903c4b36eb917dcce1f49bc0a4ea75907..9d6b96913cf2fc790ae47b167bf8c09a6ae61be7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-22  Jakub Jelinek  <jakub@redhat.com>
+
+       * decl.c (reshape_init): Convert array designator to sizetype.
+
 2004-02-22  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        Backport from mainline

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b558f0945358b51a303f06bcee9f11a94f899336..942c6a4c419d4b627ac719c3e1d2ace586ffc046 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8395,7 +8395,7 @@ reshape_init (tree type, tree *initp)
              TREE_CHAIN (element_init) = CONSTRUCTOR_ELTS (new_init);
              CONSTRUCTOR_ELTS (new_init) = element_init;
              if (TREE_PURPOSE (element_init))
-               index = TREE_PURPOSE (element_init);
+               index = convert (sizetype, TREE_PURPOSE (element_init));
            }
        }
       else

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d2252d6ee0bd94004e9af50d99f0d37a01f172ac..199c8f52bf9f52953a3c2d865021ef21d42ae7da 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-22  Jakub Jelinek  <jakub@redhat.com>
+
+       * g++.dg/parse/init1.C: New test.
+
 2004-02-22  Hans-Peter Nilsson  <hp@axis.com>
 
        PR target/14209

diff --git a/gcc/testsuite/g++.dg/parse/init1.C b/gcc/testsuite/g++.dg/parse/init1.C
new file mode 100644 (file)
index 0000000..7e70115
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/init1.C
@@ -0,0 +1,2 @@
+// { dg-do compile }
+int i[8] = { [0] 3 };