* decl2.c (grokfield): Bail out if type is error_mark_node.

From-SVN: r32582

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f5b91d0292124980fae7ba4c2ca94bcc5f266fa4..02d7de871b51110825079b4aa52dbc3191c6c05f 100644 (file)
--- 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 f7ed5810e3b0d2eb18ab811bf37287eeb676e200..266e6601c883c446b623a67ecf20b3bde59b9db4 100644 (file)
--- 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)