re PR tree-optimization/25290 (PHI-OPT could be rewritten so that is uses fold)

2008-02-27  Richard Guenther  <rguenther@suse.de>

	PR middle-end/25290
	* fold-const.c (fold_unary): Return the correct argument,
	converted to the result type.

	* gcc.c-torture/execute/pr35390.c: New testcase.

From-SVN: r132710

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8e74f5c58a076906f4c9d843aa00fd772a03b36..aff90b89e5d2d3de843dc6238ab54a81727bd9fe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-27  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/25290
+       * fold-const.c (fold_unary): Return the correct argument,
+       converted to the result type.
+
 2008-02-27  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/34971

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index f6a73efe9ad40164999261f0749c0984c0bcfdf0..987acf1649cf5638d2f1d89ade53c99ca37a57a2 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -8340,7 +8340,7 @@ fold_unary (enum tree_code code, tree type, tree op0)
       if (TREE_CODE (arg0) == INTEGER_CST)
         return fold_not_const (arg0, type);
       else if (TREE_CODE (arg0) == BIT_NOT_EXPR)
-       return TREE_OPERAND (op0, 0);
+       return fold_convert (type, TREE_OPERAND (arg0, 0));
       /* Convert ~ (-A) to A - 1.  */
       else if (INTEGRAL_TYPE_P (type) && TREE_CODE (arg0) == NEGATE_EXPR)
        return fold_build2 (MINUS_EXPR, type,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8d5fff7cf2bfee588e13b051ec34d64b06b7be00..51196bb03ae1788743115856cd742c9ebf154a54 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-27  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/25290
+       * gcc.c-torture/execute/pr35390.c: New testcase.
+
 2008-02-27  Samuel Tardieu  <sam@rfc1149.net>
 
        PR ada/22255

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr35390.c b/gcc/testsuite/gcc.c-torture/execute/pr35390.c
new file mode 100644 (file)
index 0000000..7103a9b
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr35390.c
@@ -0,0 +1,13 @@
+extern void abort (void);
+
+unsigned int foo (int n)
+{
+  return ~((unsigned int)~n);
+}
+
+int main()
+{
+  if (foo(0) != 0)
+    abort ();
+  return 0;
+}