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.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8e74f5..aff90b8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2008-02-27  Richard Guenther  <rguenther@suse.de>
 
 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
        * expr.c (expand_expr_real_1): Assert on rotates that operate
        on partial modes.
        PR middle-end/34971
        * expr.c (expand_expr_real_1): Assert on rotates that operate
        on partial modes.

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index f6a73ef..987acf1 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)
       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,
       /* 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 8d5fff7..51196bb 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
 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;
+}