re PR middle-end/37289 (ICE after non-trivial conversion at assignment)

2008-08-31  Richard Guenther  <rguenther@suse.de>

	PR middle-end/37289
	* fold-const.c (fold_binary): Retain conversions in folding
	~A + 1 to -A.

	* gcc.dg/pr37289.c: New testcase.

From-SVN: r139831

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b20e8b23769fbe37366c1f28e9d84187df9f1b34..72a46cfefab66a45f9478bc660af3923e14108bf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-31  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/37289
+       * fold-const.c (fold_binary): Retain conversions in folding
+       ~A + 1 to -A.
+
 2008-08-31  Jan Hubicka  <jh@suse.cz>
 
        * postreload-gcse.c (eliminate_partially_redundant_loads): Use optimize_bb_for_size_p.

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index ae66ad4ee2daa01bf1fe53874f14ee52d6067e2d..561fb809314b61a3f54f8b47478d0689a820bb53 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -9498,7 +9498,8 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
          /* Convert ~A + 1 to -A.  */
          if (TREE_CODE (arg0) == BIT_NOT_EXPR
              && integer_onep (arg1))
-           return fold_build1 (NEGATE_EXPR, type, TREE_OPERAND (arg0, 0));
+           return fold_build1 (NEGATE_EXPR, type,
+                               fold_convert (type, TREE_OPERAND (arg0, 0)));
 
          /* ~X + X is -1.  */
          if (TREE_CODE (arg0) == BIT_NOT_EXPR

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c03514ceee01d74b8450d3b88215bbf6a5548ef4..153c538fc9ce6a19b90a9ccbbb0953d6dfbfc888 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-31  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/37289
+       * gcc.dg/pr37289.c: New testcase.
+
 2008-08-31  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/37168

diff --git a/gcc/testsuite/gcc.dg/pr37289.c b/gcc/testsuite/gcc.dg/pr37289.c
new file mode 100644 (file)
index 0000000..61513c9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr37289.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-fdump-tree-original" } */
+
+void f(unsigned long x);
+
+void g(long x)
+{
+  f((unsigned long)(-1-x)+1);
+}
+
+/* Make sure we do not lose the conversion.  */
+
+/* { dg-final { scan-tree-dump "-\\\(long unsigned int\\\) x" "original" } } */
+/* { dg-final { cleanup-tree-dump "original" } } */