* fold-const.c (optimize_bit_field_compare): Recursively call

	fold when simplifying non-constant comparisons between bit-fields.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45098d9..965a9cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-13  Roger Sayle  <roger@eyesopen.com>
+
+       * fold-const.c (optimize_bit_field_compare): Recursively call
+       fold when simplifying non-constant comparisons between bit-fields.
+
 2006-11-13  Jakub Jelinek  <jakub@redhat.com>
 
        * configure.ac: Add changequote around __LONG_DOUBLE_MATH_OPTIONAL

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index c986503..fe7ec58 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3441,15 +3441,19 @@ optimize_bit_field_compare (enum tree_code code, tree compare_type,
   if (! const_p)
     /* If not comparing with constant, just rework the comparison
        and return.  */
-    return build2 (code, compare_type,
-                  build2 (BIT_AND_EXPR, unsigned_type,
-                          make_bit_field_ref (linner, unsigned_type,
-                                              nbitsize, nbitpos, 1),
-                          mask),
-                  build2 (BIT_AND_EXPR, unsigned_type,
-                          make_bit_field_ref (rinner, unsigned_type,
-                                              nbitsize, nbitpos, 1),
-                          mask));
+    return fold_build2 (code, compare_type,
+                       fold_build2 (BIT_AND_EXPR, unsigned_type,
+                                    make_bit_field_ref (linner,
+                                                        unsigned_type,
+                                                        nbitsize, nbitpos,
+                                                        1),
+                                    mask),
+                       fold_build2 (BIT_AND_EXPR, unsigned_type,
+                                    make_bit_field_ref (rinner,
+                                                        unsigned_type,
+                                                        nbitsize, nbitpos,
+                                                        1),
+                                    mask));
 
   /* Otherwise, we are handling the constant case. See if the constant is too
      big for the field.  Warn and return a tree of for 0 (false) if so.  We do