re PR rtl-optimization/61222 (ICE on valid code at -O2 and -O3 on…

re PR rtl-optimization/61222 (ICE on valid code at -O2 and -O3 on x86_64-linux-gnu in decompose, at rtl.h:1456)

gcc/
	PR rtl-optimization/61222
	* combine.c (simplify_shift_const_1): When moving a PLUS outside
	the shift, truncate the PLUS operand to the result mode.

gcc/testsuite/
	PR rtl-optimization/61222
	* gcc.c-torture/compile/pr61222-1.c: New test.
	* gcc.c-torture/compile/pr61222-2.c: Likewise.

From-SVN: r210945

gcc/ChangeLog

+2014-05-26  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	PR rtl-optimization/61222
+	* combine.c (simplify_shift_const_1): When moving a PLUS outside
+	the shift, truncate the PLUS operand to the result mode.
+
 2014-05-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/61271

gcc/combine.c

@@ -10349,9 +10349,10 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
 	  /* (ashift (plus foo C) N) is (plus (ashift foo N) C').  */
 	  if (code == ASHIFT
 	      && CONST_INT_P (XEXP (varop, 1))
-	      && (new_rtx = simplify_const_binary_operation (ASHIFT, result_mode,
-							 XEXP (varop, 1),
-							 GEN_INT (count))) != 0
+	      && (new_rtx = simplify_const_binary_operation
+		  (ASHIFT, result_mode,
+		   gen_int_mode (INTVAL (XEXP (varop, 1)), result_mode),
+		   GEN_INT (count))) != 0
 	      && CONST_INT_P (new_rtx)
 	      && merge_outer_ops (&outer_op, &outer_const, PLUS,
 				  INTVAL (new_rtx), result_mode, &complement_p))
@@ -10368,9 +10369,10 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
 	  if (code == LSHIFTRT
 	      && CONST_INT_P (XEXP (varop, 1))
 	      && mode_signbit_p (result_mode, XEXP (varop, 1))
-	      && (new_rtx = simplify_const_binary_operation (code, result_mode,
-							 XEXP (varop, 1),
-							 GEN_INT (count))) != 0
+	      && (new_rtx = simplify_const_binary_operation
+		  (code, result_mode,
+		   gen_int_mode (INTVAL (XEXP (varop, 1)), result_mode),
+		   GEN_INT (count))) != 0
 	      && CONST_INT_P (new_rtx)
 	      && merge_outer_ops (&outer_op, &outer_const, XOR,
 				  INTVAL (new_rtx), result_mode, &complement_p))

gcc/testsuite/ChangeLog

+2014-05-26  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	PR rtl-optimization/61222
+	* gcc.c-torture/compile/pr61222-1.c: New test.
+	* gcc.c-torture/compile/pr61222-2.c: Likewise.
+
 2014-05-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	* c-c++-common/cilk-plus/AN/pr61191.c: Fix dg-error directives.

gcc/testsuite/gcc.c-torture/compile/pr61222-1.c

+int a, b, d, e;
+char c;
+
+void
+foo ()
+{
+  for (; a; a++)
+    {
+      d = ((b == 0) ^ (129 + a));
+      c = d * 9;
+      e = c < 1;
+      if (e)
+	for (;;)
+	  ;
+    }
+}
+
+int
+main ()
+{
+  foo ();
+  return 0;
+}

gcc/testsuite/gcc.c-torture/compile/pr61222-2.c

+int a, b, d;
+int main (void)
+{
+  int c = a && 1;
+  d = 1 << (((c | (b - 842)) << 1) + 1);
+  return 0;
+}