checked in wrong version

From-SVN: r29892

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 37915a48e503647a53f00f000b12d058bb395e40..ca9940c63f9b68d8347e1227efb309dad6df613a 100644 (file)
--- a/gcc/c-decl.c
+++ b/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);

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index c9281d79c07f22b0def9309b8f6e6eabba79b241..47fc7052266068429429288f4e14c1f6ba43c139 100644 (file)
--- a/gcc/cp/class.c
+++ b/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);