aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/decl2.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f5b91d0..02d7de8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-16 Nathan Sidwell <nathan@codesourcery.com>
+
+ * decl2.c (grokfield): Bail out if type is error_mark_node.
+
2000-03-15 Nathan Sidwell <nathan@codesourcery.com>
* tinfo2.cc (__ptr_to_member_data): Rename to ...
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index f7ed581..266e660 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1593,6 +1593,8 @@ grokfield (declarator, declspecs, init, asmspec_tree, attrlist)
if (! value || value == error_mark_node)
/* friend or constructor went bad. */
return value;
+ if (TREE_TYPE (value) == error_mark_node)
+ return error_mark_node;
/* Pass friendly classes back. */
if (TREE_CODE (value) == VOID_TYPE)