diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/error2.C | 15 |
4 files changed, 34 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04977ae..3b91d68 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-03-27 Simon Martin <simartin@users.sourceforge.net> + + PR c++/29727 + * decl.c (check_array_designated_initializer): Handle error_mark_node. + 2009-03-27 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR c++/35652 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a96e606..2a89ef4 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4419,9 +4419,15 @@ check_array_designated_initializer (const constructor_elt *ce) { /* The parser only allows identifiers as designated initializers. */ - gcc_assert (TREE_CODE (ce->index) == IDENTIFIER_NODE); - error ("name %qD used in a GNU-style designated " - "initializer for an array", ce->index); + if (ce->index == error_mark_node) + error ("name used in a GNU-style designated " + "initializer for an array"); + else + { + gcc_assert (TREE_CODE (ce->index) == IDENTIFIER_NODE); + error ("name %qD used in a GNU-style designated " + "initializer for an array", ce->index); + } return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea4b9c3..950397f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-03-27 Simon Martin <simartin@users.sourceforge.net> + + PR c++/29727 + * g++.dg/init/error2.C: New test. + 2009-03-27 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR c++/35652 diff --git a/gcc/testsuite/g++.dg/init/error2.C b/gcc/testsuite/g++.dg/init/error2.C new file mode 100644 index 0000000..8cf59b3 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/error2.C @@ -0,0 +1,15 @@ +/* PR c++/29727 */ +/* { dg-do "compile" } */ + +template<int> struct A +{ + static int a[1]; +}; +template<int N> int A<N>::a[1] = { X:0 }; /* { dg-error "does not allow designated|was not declared|designated initializer for an array" } */ + +void foo() +{ + A<0>::a; +} + + |