class.c (duplicate_tag_error): Robustify flag clearing.

cp:
	* class.c (duplicate_tag_error): Robustify flag clearing.

From-SVN: r39130

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 69e74738ccaa9ef5c04a555f476c1e205a9d8696..b81617e82f4a523b428d78737b5e00c2337da462 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-19  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * class.c (duplicate_tag_error): Robustify flag clearing.
+
 2001-01-19  Nathan Sidwell  <nathan@codesourcery.com>
 
        * cp-tree.h (lookup_template_class): Add complain parm.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 888e8ae6c53b837e3f1a1d279bcbc06a33b39d7c..423fb32671d05f9cf1d0a393d0baf11f7b532a65 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2375,25 +2375,16 @@ duplicate_tag_error (t)
   TYPE_CONTEXT (t) = NULL_TREE;
   TYPE_NONCOPIED_PARTS (t) = NULL_TREE;
   
-  TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) = 0;
-  TYPE_HAS_CONSTRUCTOR (t) = 0;
-  TYPE_HAS_DESTRUCTOR (t) = 0;
-  TYPE_HAS_CONVERSION (t) = 0;
-  TYPE_HAS_ASSIGN_REF (t) = 0;
-  TYPE_HAS_CONST_ASSIGN_REF (t) = 0;
-  TYPE_HAS_INIT_REF (t) = 0;
-  TYPE_HAS_CONST_INIT_REF (t) = 0;
-  TYPE_HAS_NEW_OPERATOR (t) = 0;
-  TYPE_HAS_ARRAY_NEW_OPERATOR (t) = 0;
-  TYPE_HAS_DEFAULT_CONSTRUCTOR (t) = 0;
-  CLASSTYPE_HAS_MUTABLE (t) = 0;
-  CLASSTYPE_NON_POD_P (t) = 0;
-  CLASSTYPE_NEARLY_EMPTY_P (t) = 0;
-  CLASSTYPE_NON_AGGREGATE (t) = 0;
-  TYPE_HAS_REAL_ASSIGN_REF (t) = 0;
-  TYPE_HAS_COMPLEX_ASSIGN_REF (t) = 0;
-  TYPE_HAS_ABSTRACT_ASSIGN_REF (t) = 0;
-  TYPE_HAS_COMPLEX_INIT_REF (t) = 0;
+  /* Clear TYPE_LANG_FLAGS -- those in TYPE_LANG_SPECIFIC are cleared above.  */
+  TYPE_LANG_FLAG_0 (t) = 0;
+  TYPE_LANG_FLAG_1 (t) = 0;
+  TYPE_LANG_FLAG_2 (t) = 0;
+  TYPE_LANG_FLAG_3 (t) = 0;
+  TYPE_LANG_FLAG_4 (t) = 0;
+  TYPE_LANG_FLAG_5 (t) = 0;
+  TYPE_LANG_FLAG_6 (t) = 0;
+  /* But not this one.  */
+  SET_IS_AGGR_TYPE (t, 1);
 }
 
 /* Make the BINFO's vtablehave N entries, including RTTI entries,