c-typeck.c (set_init_index): Require designator to be of integer type.

	* c-typeck.c (set_init_index): Require designator to be of integer
	type.

testsuite:
	* gcc.dg/c99-init-3.c, gcc.dg/gnu99-init-2.c: New tests.
	* gcc.dg/noncompile/921102-1.c: Update expected error message.

From-SVN: r85023

gcc/ChangeLog

 2004-07-22  Joseph S. Myers  <jsm@polyomino.org.uk>
 
+	* c-typeck.c (set_init_index): Require designator to be of integer
+	type.
+
+2004-07-22  Joseph S. Myers  <jsm@polyomino.org.uk>
+
 	PR c/11250
 	* c-parse.in (init): Change to exprtype.
 	(primary): Set original_code for STRING to STRING_CST.

gcc/c-typeck.c

@@ -4956,6 +4956,13 @@ set_init_index (tree first, tree last)
 
   designator_errorneous = 1;
 
+  if (!INTEGRAL_TYPE_P (TREE_TYPE (first))
+      || (last && !INTEGRAL_TYPE_P (TREE_TYPE (last))))
+    {
+      error_init ("array index in initializer not of integer type");
+      return;
+    }
+
   while ((TREE_CODE (first) == NOP_EXPR
 	  || TREE_CODE (first) == CONVERT_EXPR
 	  || TREE_CODE (first) == NON_LVALUE_EXPR)

gcc/testsuite/ChangeLog

 2004-07-22  Joseph S. Myers  <jsm@polyomino.org.uk>
 
+	* gcc.dg/c99-init-3.c, gcc.dg/gnu99-init-2.c: New tests.
+	* gcc.dg/noncompile/921102-1.c: Update expected error message.
+
+2004-07-22  Joseph S. Myers  <jsm@polyomino.org.uk>
+
 	PR c/11250
 	* gcc.dg/init-string-1.c: New test.
 

gcc/testsuite/gcc.dg/c99-init-3.c

+/* Test for designated initializers: array designators must be of
+   integer type.  */
+/* Origin: Joseph Myers <jsm@polyomino.org.uk> */
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
+
+int a[] = { [(void *)0] = 1 }; /* { dg-bogus "warning" "warning in place of error" } */
+/* { dg-error "integer type|near init" "pointer designator"  { target *-*-* } 7 } */

gcc/testsuite/gcc.dg/gnu99-init-2.c

+/* Test for designated initializers: array designators must be of
+   integer type.  Test for index ranges (GNU extension).  */
+/* Origin: Joseph Myers <jsm@polyomino.org.uk> */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99" } */
+
+int a[] = { [(void *)0 ... 0] = 1 }; /* { dg-bogus "warning" "warning in place of error" } */
+/* { dg-error "integer type|near init" "pointer designator"  { target *-*-* } 7 } */
+
+int b[] = { [0 ... (void *)0] = 1 }; /* { dg-bogus "warning" "warning in place of error" } */
+/* { dg-error "integer type|near init" "pointer designator"  { target *-*-* } 10 } */

gcc/testsuite/gcc.dg/noncompile/921102-1.c

-int x[]={[0.3 ... 4.6]9}; /* { dg-error "nonconstant array|near init" } */
+int x[]={[0.3 ... 4.6]9}; /* { dg-error "not of integer type|near init" } */