re PR rtl-optimization/39588 (internal compiler error: in trunc_int_for_mode, at...

	PR rtl-optimization/39588
	* combine.c (merge_outer_ops): Do not set the constant when this
	is not necessary.
	(simplify_shift_const_1): Do not modify it either in this case.

From-SVN: r145432

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4a3c47b4e1e0f991c0a4904357dead94da14bc69..7adac9c105198078d7a9ebc03d57b84aefee25d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR rtl-optimization/39588
+       * combine.c (merge_outer_ops): Do not set the constant when this
+       is not necessary.
+       (simplify_shift_const_1): Do not modify it either in this case.
+
 2009-03-26  Ben Elliston  <bje@au.ibm.com>
 
        Backport from mainline:

diff --git a/gcc/combine.c b/gcc/combine.c
index 7dacd4cd0d28cc7b9e92f0b0b2aaf92e7a5d4b4c..5d8239d0d9c028abb60d1205f586dfb56b2e74e5 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -8970,13 +8970,13 @@ merge_outer_ops (enum rtx_code *pop0, HOST_WIDE_INT *pconst0, enum rtx_code op1,
           && op0 == AND)
     op0 = UNKNOWN;
 
+  *pop0 = op0;
+
   /* ??? Slightly redundant with the above mask, but not entirely.
      Moving this above means we'd have to sign-extend the mode mask
      for the final test.  */
-  const0 = trunc_int_for_mode (const0, mode);
-
-  *pop0 = op0;
-  *pconst0 = const0;
+  if (op0 != UNKNOWN && op0 != NEG)
+    *pconst0 = trunc_int_for_mode (const0, mode);
 
   return 1;
 }
@@ -9699,7 +9699,8 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
 
   if (outer_op != UNKNOWN)
     {
-      if (GET_MODE_BITSIZE (result_mode) < HOST_BITS_PER_WIDE_INT)
+      if (GET_RTX_CLASS (outer_op) != RTX_UNARY
+         && GET_MODE_BITSIZE (result_mode) < HOST_BITS_PER_WIDE_INT)
        outer_const = trunc_int_for_mode (outer_const, result_mode);
 
       if (outer_op == AND)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f69e9e947196b1c013a04f035402e3140c67e61..1ab4b0eb58e411bcd0bb5d9925c49990ec08514d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc.c-torture/compile/20090401-1.c: New test.
+
 2009-03-26  Ben Elliston  <bje@au.ibm.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/gcc.c-torture/compile/20090401-1.c b/gcc/testsuite/gcc.c-torture/compile/20090401-1.c
new file mode 100644 (file)
index 0000000..a0058fe
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20090401-1.c
@@ -0,0 +1,11 @@
+/* PR rtl-optimization/39588 */
+/* Testcase by Olivier ROUSSEL <olivier.roussel@cril.univ-artois.fr> */
+
+#define lit_from_int(in) ((in<0)?(((-in)<<1)|1):(in<<1))
+
+void init_clause(int *literals, int size, int *lits)
+{
+  int i;
+  for(i=0; i < size; i++)
+    lits[i] = lit_from_int(literals[i]);
+}