From 07b983cd7142b619b990d572a89a3370ae12f7a6 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Sun, 10 Oct 1999 15:23:38 -0400
Subject: [PATCH] checked in wrong version

From-SVN: r29892
---
 gcc/c-decl.c   | 4 ++--
 gcc/cp/class.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 37915a48e503..ca9940c63f9b 100644
--- 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 c9281d79c07f..47fc70522660 100644
--- 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);