aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Ellcey <sje@cup.hp.com>2006-07-17 15:28:17 +0000
committerSteve Ellcey <sje@gcc.gnu.org>2006-07-17 15:28:17 +0000
commit77bffd4cee22d47afd683172ad0a91e4c4cd4990 (patch)
treee91f0f08996f2515a3c5104dbbd586a37b4e8bb5
parent81a5e9526bd3b7658710ff214a65c5a3ed6ebdcf (diff)
downloadgcc-77bffd4cee22d47afd683172ad0a91e4c4cd4990.zip
gcc-77bffd4cee22d47afd683172ad0a91e4c4cd4990.tar.gz
gcc-77bffd4cee22d47afd683172ad0a91e4c4cd4990.tar.bz2
re PR c++/28291 (ICE on invalid designated initializer)
PR c++/28291 * decl.c (reshape_init_class): Return error_mark_node on error. From-SVN: r115523
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4741d4a..ebbbb62 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
2006-07-17 Steve Ellcey <sje@cup.hp.com>
+ PR c++/28291
+ * decl.c (reshape_init_class): Return error_mark_node on error.
+
+2006-07-17 Steve Ellcey <sje@cup.hp.com>
+
PR c++/28304
* decl2.c (check_classfn): Return NULL_TREE on error.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b74a1a9..dd0e7e3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4505,8 +4505,11 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p)
field = lookup_field_1 (type, d->cur->index, /*want_type=*/false);
if (!field || TREE_CODE (field) != FIELD_DECL)
- error ("%qT has no non-static data member named %qD", type,
- d->cur->index);
+ {
+ error ("%qT has no non-static data member named %qD", type,
+ d->cur->index);
+ return error_mark_node;
+ }
}
/* If we processed all the member of the class, we are done. */