diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/array-const-1.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/array-const-2.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/array-const-3.c | 9 |
6 files changed, 54 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a48db46..51d848d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-04-24 Joseph Myers <joseph@codesourcery.com> + + * c-typeck.c (set_init_index): Allow array designators that are + not integer constant expressions with a pedwarn if pedantic. + 2009-04-24 Bernd Schmidt <bernd.schmidt@analog.com> * simplify-rtx.c (simplify_binary_operation_1, case AND): Result is diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index c7ea328..1cfab1f 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -6422,6 +6422,24 @@ set_init_index (tree first, tree last) } if (TREE_CODE (first) != INTEGER_CST) + { + first = c_fully_fold (first, false, NULL); + if (TREE_CODE (first) == INTEGER_CST) + pedwarn_init (input_location, OPT_pedantic, + "array index in initializer is not " + "an integer constant expression"); + } + + if (last && TREE_CODE (last) != INTEGER_CST) + { + last = c_fully_fold (last, false, NULL); + if (TREE_CODE (last) == INTEGER_CST) + pedwarn_init (input_location, OPT_pedantic, + "array index in initializer is not " + "an integer constant expression"); + } + + if (TREE_CODE (first) != INTEGER_CST) error_init ("nonconstant array index in initializer"); else if (last != 0 && TREE_CODE (last) != INTEGER_CST) error_init ("nonconstant array index in initializer"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b4ec0dd..083a7e3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-24 Joseph Myers <joseph@codesourcery.com> + + * gcc.dg/array-const-1.c, gcc.dg/array-const-2.c, + gcc.dg/array-const-3.c: New tests. + 2009-04-24 Ian Lance Taylor <iant@google.com> * gcc.dg/Wcxx-compat-4.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/array-const-1.c b/gcc/testsuite/gcc.dg/array-const-1.c new file mode 100644 index 0000000..0e0c462 --- /dev/null +++ b/gcc/testsuite/gcc.dg/array-const-1.c @@ -0,0 +1,8 @@ +/* Test for array designators not integer constant expressions but + folding to integer constants (used in Linux kernel, + <http://gcc.gnu.org/ml/gcc/2009-04/msg00611.html>). */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99" } */ + +extern int i; +int a[] = { [1 ? 1 : i] = 0 }; diff --git a/gcc/testsuite/gcc.dg/array-const-2.c b/gcc/testsuite/gcc.dg/array-const-2.c new file mode 100644 index 0000000..f6e2bd5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/array-const-2.c @@ -0,0 +1,9 @@ +/* Test for array designators not integer constant expressions but + folding to integer constants (used in Linux kernel, + <http://gcc.gnu.org/ml/gcc/2009-04/msg00611.html>). */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99 -pedantic" } */ + +extern int i; +int a[] = { [1 ? 1 : i] = 0 }; /* { dg-warning "array index in initializer is not an integer constant expression" } */ +/* { dg-warning "near initialization" "near init" { target *-*-* } 8 } */ diff --git a/gcc/testsuite/gcc.dg/array-const-3.c b/gcc/testsuite/gcc.dg/array-const-3.c new file mode 100644 index 0000000..5bb215c --- /dev/null +++ b/gcc/testsuite/gcc.dg/array-const-3.c @@ -0,0 +1,9 @@ +/* Test for array designators not integer constant expressions but + folding to integer constants (used in Linux kernel, + <http://gcc.gnu.org/ml/gcc/2009-04/msg00611.html>). */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99 -pedantic-errors" } */ + +extern int i; +int a[] = { [1 ? 1 : i] = 0 }; /* { dg-error "array index in initializer is not an integer constant expression" } */ +/* { dg-error "near initialization" "near init" { target *-*-* } 8 } */ |