2007-08-04 Andrew Pinski <andrew_pinski@playstation.sony.com>

        PR middle-end/32780
        * fold-const.c (fold_binary <case MINUS_EXPR>): Fix the type of operands
        for the folding of "A - (A & B)" into "~B & A"; cast them to type.

2007-08-04  Andrew Pinski  <andrew_pinski@playstation.sony.com>

        PR middle-end/32780
        * gcc.c-torture/compile/pr32780.c: New test.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33211ce..36a4342 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-04  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       PR middle-end/32780
+       * fold-const.c (fold_binary <case MINUS_EXPR>): Fix the type of operands
+       for the folding of "A - (A & B)" into "~B & A"; cast them to type.
+
 2007-08-03  Zdenek Dvorak  <ook@ucw.cz>
 
        * tree-ssa-threadupdate.c (thread_through_all_blocks): Use loops' state

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index be46b23..154454a 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -9730,15 +9730,19 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
              && TREE_CODE (arg1) == BIT_AND_EXPR)
            {
              if (operand_equal_p (arg0, TREE_OPERAND (arg1, 1), 0))
-               return fold_build2 (BIT_AND_EXPR, type,
-                                   fold_build1 (BIT_NOT_EXPR, type,
-                                                TREE_OPERAND (arg1, 0)),
-                                   arg0);
+               {
+                 tree arg10 = fold_convert (type, TREE_OPERAND (arg1, 0));
+                 return fold_build2 (BIT_AND_EXPR, type,
+                                     fold_build1 (BIT_NOT_EXPR, type, arg10),
+                                     fold_convert (type, arg0));
+               }
              if (operand_equal_p (arg0, TREE_OPERAND (arg1, 0), 0))
-               return fold_build2 (BIT_AND_EXPR, type,
-                                   fold_build1 (BIT_NOT_EXPR, type,
-                                                TREE_OPERAND (arg1, 1)),
-                                   arg0);
+               {
+                 tree arg11 = fold_convert (type, TREE_OPERAND (arg1, 1));
+                 return fold_build2 (BIT_AND_EXPR, type,
+                                     fold_build1 (BIT_NOT_EXPR, type, arg11),
+                                     fold_convert (type, arg0));
+               }
            }
 
          /* Fold (A & ~B) - (A & B) into (A ^ B) - B, where B is

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8814bd2..9371c1c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-04  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+       PR middle-end/32780
+       * gcc.c-torture/compile/pr32780.c: New test.
+
 2007-08-03  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
        RP middle-end/32399

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr32780.c b/gcc/testsuite/gcc.c-torture/compile/pr32780.c
new file mode 100644 (file)
index 0000000..cfe64e4
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr32780.c
@@ -0,0 +1,10 @@
+typedef __SIZE_TYPE__ size_t;
+extern void dont_optimize_away(size_t);
+
+void crashGcc(char*a)
+{
+        size_t b=(size_t)a - ((size_t)a & 1);
+        size_t c=(size_t)a - (b & (size_t)a);
+        dont_optimize_away(b+c);
+}
+