aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-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. */