* fold-const.c (fold): STRIP_NOPS when deciding whether or not

	something is a candidate for optimize_bit_field_compare.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27169 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34f612d..2739bd9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 26 09:53:05 1999  Mark Mitchell  <mark@codesourcery.com>
+
+        * fold-const.c (fold): STRIP_NOPS when deciding whether or not
+       something is a candidate for optimize_bit_field_compare.
+
 Wed May 26 09:40:02 1999  Mark Mitchell  <mark@codesourcery.com>
 
        * gcc.texi (Passes): Document branch-shortening.

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 6acbe0b..b67ff82 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -6036,16 +6036,20 @@ fold (expr)
        }
 
       /* If this is a comparison of a field, we may be able to simplify it.  */
-      if ((TREE_CODE (arg0) == COMPONENT_REF
-          || TREE_CODE (arg0) == BIT_FIELD_REF)
-         && (code == EQ_EXPR || code == NE_EXPR)
-         /* Handle the constant case even without -O
-            to make sure the warnings are given.  */
-         && (optimize || TREE_CODE (arg1) == INTEGER_CST))
-       {
-         t1 = optimize_bit_field_compare (code, type, arg0, arg1);
-         return t1 ? t1 : t;
-       }
+      {
+       tree xarg0 = arg0;
+       STRIP_NOPS (xarg0);
+       if ((TREE_CODE (xarg0) == COMPONENT_REF
+            || TREE_CODE (xarg0) == BIT_FIELD_REF)
+           && (code == EQ_EXPR || code == NE_EXPR)
+           /* Handle the constant case even without -O
+              to make sure the warnings are given.  */
+           && (optimize || TREE_CODE (arg1) == INTEGER_CST))
+         {
+           t1 = optimize_bit_field_compare (code, type, xarg0, arg1);
+           return t1 ? t1 : t;
+         }
+      }
 
       /* If this is a comparison of complex values and either or both sides
         are a COMPLEX_EXPR or COMPLEX_CST, it is best to split up the