[multiple changes]

2008-12-23  Andrew Pinski  <pinski@gmail.com>

        PR middle-end/38590
        * fold-const.c (fold_binary): Call fold_convert on arguments to
        fold_build2 for negative divide optimization.

2008-12-23  Andrew Pinski  <pinskia@gmail.com>

        PR middle-end/38590
        * gcc.c-torture/compile/pr38590-1.c: New testcase.
        * gcc.c-torture/compile/pr38590-2.c: New testcase.

From-SVN: r142906

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 690a1c95aba52168e4d33b8c8fe1703e44dad696..1c45c7b1b004332980e70ce125bbd0ee8c8cfe16 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Andrew Pinski  <pinski@gmail.com>
+
+       PR middle-end/38590
+       * fold-const.c (fold_binary): Call fold_convert on arguments to
+       fold_build2 for negative divide optimization.
+
 2008-12-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/31150

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 8c0cb1d153f9696a1b018103014c49c4e6ba8bf4..74a0a87d3cc29e040a6291e9da180905c334f26b 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11678,7 +11678,7 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
                                   WARN_STRICT_OVERFLOW_MISC);
          return fold_build2 (code, type,
                              fold_convert (type, TREE_OPERAND (arg0, 0)),
-                             negate_expr (arg1));
+                             fold_convert (type, negate_expr (arg1)));
        }
       if ((!INTEGRAL_TYPE_P (type) || TYPE_OVERFLOW_UNDEFINED (type))
          && TREE_CODE (arg1) == NEGATE_EXPR
@@ -11689,8 +11689,9 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
                                    "when distributing negation across "
                                    "division"),
                                   WARN_STRICT_OVERFLOW_MISC);
-         return fold_build2 (code, type, negate_expr (arg0),
-                             TREE_OPERAND (arg1, 0));
+         return fold_build2 (code, type,
+                             fold_convert (type, negate_expr (arg0)),
+                             fold_convert (type, TREE_OPERAND (arg1, 0)));
        }
 
       /* If arg0 is a multiple of arg1, then rewrite to the fastest div

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4f52c75009624af0069f3093ea169599424d06c..f3e065b20602b704252200ece704a651e87ec658 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Andrew Pinski  <pinskia@gmail.com>
+
+       PR middle-end/38590
+       * gcc.c-torture/compile/pr38590-1.c: New testcase.
+       * gcc.c-torture/compile/pr38590-2.c: New testcase.
+
 2008-12-18  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/31150

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr38590-1.c b/gcc/testsuite/gcc.c-torture/compile/pr38590-1.c
new file mode 100644 (file)
index 0000000..8797654
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr38590-1.c
@@ -0,0 +1,6 @@
+
+int func_75 (int p_76) 
+{
+  return (1 / (int) -(unsigned int)p_76);
+}
+

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr38590-2.c b/gcc/testsuite/gcc.c-torture/compile/pr38590-2.c
new file mode 100644 (file)
index 0000000..076359d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr38590-2.c
@@ -0,0 +1,6 @@
+
+int func_75 (int p_76) 
+{
+  return (1 / (int) -(unsigned int)p_76) ? 1 : p_76;
+}
+