From: phython <phython@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 4 Mar 2005 02:48:30 +0000 (+0000)
Subject: 2005-03-03  James A. Morrison  <phython@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa8057b43cfc5906f3ec496e182a913613b60a96;p=thirdparty%2Fgcc.git

2005-03-03  James A. Morrison  <phython@gcc.gnu.org>

        PR tree-optimization/15784
        * fold-const.c (fold): Fold ~A + 1 to -1.  Fold -A - 1
        and -1 - A to ~A.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67c26a21d4cb..19b45f231d91 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-03  James A. Morrison  <phython@gcc.gnu.org>
+
+	PR tree-optimization/15784
+	* fold-const.c (fold): Fold ~A + 1 to -1.  Fold -A - 1
+	and -1 - A to ~A.
+
 2005-03-03  David Edelsohn  <edelsohn@gnu.org>
 
 	* config/rs6000/predicates.md (branch_comparison_operator):
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 72e557eeb717..2c6d71ec0308 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -7223,6 +7223,11 @@ fold (tree expr)
       if (TREE_CODE (arg0) == NEGATE_EXPR
 	  && reorder_operands_p (TREE_OPERAND (arg0, 0), arg1))
 	return fold (build2 (MINUS_EXPR, type, arg1, TREE_OPERAND (arg0, 0)));
+      /* Convert ~A + 1 to -A.  */
+      if (INTEGRAL_TYPE_P (type)
+	  && TREE_CODE (arg0) == BIT_NOT_EXPR
+	  && integer_onep (arg1))
+	return fold (build1 (NEGATE_EXPR, type, TREE_OPERAND (arg0, 0)));
 
       if (TREE_CODE (type) == COMPLEX_TYPE)
 	{
@@ -7661,6 +7666,16 @@ fold (tree expr)
 	  && reorder_operands_p (arg0, arg1))
 	return fold (build2 (MINUS_EXPR, type, negate_expr (arg1),
 			     TREE_OPERAND (arg0, 0)));
+      /* Convert -A - 1 to ~A.  */
+      if (INTEGRAL_TYPE_P (type)
+	  && TREE_CODE (arg0) == NEGATE_EXPR
+	  && integer_onep (arg1))
+	return fold (build1 (BIT_NOT_EXPR, type, TREE_OPERAND (arg0, 0)));
+
+      /* Convert -1 - A to ~A.  */
+      if (INTEGRAL_TYPE_P (type)
+	  && integer_all_onesp (arg0))
+	return fold (build1 (BIT_NOT_EXPR, type, arg1));
 
       if (TREE_CODE (type) == COMPLEX_TYPE)
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e589f7bff525..b7a3692e6a25 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-03  James A. Morrison  <phython@gcc.gnu.org>
+
+	* gcc.dg/pr15784-4.c: New test.
+
 2005-03-03  Geoffrey Keating  <geoffk@apple.com>
 
 	* gcc.c-torture/execute/pr17133.c: New.
diff --git a/gcc/testsuite/gcc.dg/pr15784-4.c b/gcc/testsuite/gcc.dg/pr15784-4.c
new file mode 100644
index 000000000000..021b6375efcd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr15784-4.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+int a (int x) {
+	return ~x + 1; /* -x */
+}
+
+int b (int x) {
+	return -x -1; /* ~x */
+}
+
+/* { dg-final { scan-tree-dump "~x;" "optimized" } } */
+/* { dg-final { scan-tree-dump "-x;" "optimized" } } */