checked in wrong version

From-SVN: r29892

gcc/c-decl.c

@@ -5529,8 +5529,8 @@ finish_struct (t, fieldlist, attributes)
   /* Delete all zero-width bit-fields from the fieldlist */
   {
     tree *fieldlistp = &fieldlist;
-    while (*fieldlistp && TREE_CODE (*fieldlistp) == FIELD_DECL)
-      if (DECL_INITIAL (*fieldlistp))
+    while (*fieldlistp)
+      if (TREE_CODE (*fieldlistp) == FIELD_DECL && DECL_INITIAL (*fieldlistp))
 	*fieldlistp = TREE_CHAIN (*fieldlistp);
       else
 	fieldlistp = &TREE_CHAIN (*fieldlistp);

gcc/cp/class.c

@@ -3865,8 +3865,9 @@ finish_struct_1 (t)
   /* Delete all zero-width bit-fields from the fieldlist */
   {
     tree *fieldsp = &fields;
-    while (*fieldsp && TREE_CODE (*fieldsp) == FIELD_DECL)
-      if (DECL_C_BIT_FIELD (*fieldsp) && DECL_INITIAL (*fieldsp))
+    while (*fieldsp)
+      if (TREE_CODE (*fieldsp) == FIELD_DECL
+	  && DECL_C_BIT_FIELD (*fieldsp) && DECL_INITIAL (*fieldsp))
 	*fieldsp = TREE_CHAIN (*fieldsp);
       else
 	fieldsp = &TREE_CHAIN (*fieldsp);