aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/decl.c
diff options
context:
space:
mode:
authorSimon Martin <simartin@users.sourceforge.net>2009-03-27 13:11:29 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2009-03-27 06:11:29 -0700
commit6a837908f994e64fa285acdcc1183e9d0e41ff9a (patch)
tree67ddc3f7ea5413fd93d11c771dd20b2fc62a2309 /gcc/cp/decl.c
parenta5f805df5860bd185c77261deaa48049485bfa4e (diff)
downloadgcc-6a837908f994e64fa285acdcc1183e9d0e41ff9a.zip
gcc-6a837908f994e64fa285acdcc1183e9d0e41ff9a.tar.gz
gcc-6a837908f994e64fa285acdcc1183e9d0e41ff9a.tar.bz2
re PR c++/29727 (ICE on invalid initializer for template member)
gcc/cp/ 2009-03-27 Simon Martin <simartin@users.sourceforge.net> PR c++/29727 * decl.c (check_array_designated_initializer): Handle error_mark_node. gcc/testsuite/ 2009-03-27 Simon Martin <simartin@users.sourceforge.net> PR c++/29727 * g++.dg/init/error2.C: New test. From-SVN: r145104
Diffstat (limited to 'gcc/cp/decl.c')
-rw-r--r--gcc/cp/decl.c12
1 files changed, 9 insertions, 3 deletions
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;
}