revert: re PR tree-optimization/15784 (fold misses binary optimization)

2005-03-04  Andrew Pinski  <pinskia@physics.uc.edu>

        Revert for now:
        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.

From-SVN: r95880

gcc/ChangeLog

+2005-03-04  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	Revert for now:
+	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-04  Ben Elliston  <bje@au.ibm.com>
 
 	* gcc.c (option_map): Add --coverage.

gcc/fold-const.c

@@ -7454,11 +7454,6 @@ 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)
 	{
@@ -7897,16 +7892,6 @@ 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)
 	{