re PR middle-end/40252 (Internal compiler error on samba4 (verify_gimple failed))

2009-05-26  Richard Guenther  <rguenther@suse.de>

	PR middle-end/40252
	* fold-const.c (fold_binary): Use the correct types for building
	rotates.

	* gcc.c-torture/compile/pr40252.c: New testcase.

From-SVN: r147867

gcc/ChangeLog

 2009-05-26  Richard Guenther  <rguenther@suse.de>
 
+	PR middle-end/40252
+	* fold-const.c (fold_binary): Use the correct types for building
+	rotates.
+
+2009-05-26  Richard Guenther  <rguenther@suse.de>
+
 	* tree-vect-data-refs.c (vect_create_data_ref_ptr): Remove
 	redundant calls to merge_alias_info.
 	(bump_vector_ptr): Likewise.

gcc/fold-const.c

@@ -10175,8 +10175,12 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
 		&& TREE_INT_CST_HIGH (tree11) == 0
 		&& ((TREE_INT_CST_LOW (tree01) + TREE_INT_CST_LOW (tree11))
 		    == TYPE_PRECISION (TREE_TYPE (TREE_OPERAND (arg0, 0)))))
-	      return build2 (LROTATE_EXPR, type, TREE_OPERAND (arg0, 0),
-			     code0 == LSHIFT_EXPR ? tree01 : tree11);
+	      return fold_convert (type,
+				   build2 (LROTATE_EXPR,
+					   TREE_TYPE (TREE_OPERAND (arg0, 0)),
+					   TREE_OPERAND (arg0, 0),
+					   code0 == LSHIFT_EXPR
+					   ? tree01 : tree11));
 	    else if (code11 == MINUS_EXPR)
 	      {
 		tree tree110, tree111;
@@ -10190,10 +10194,12 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
 					      (TREE_TYPE (TREE_OPERAND
 							  (arg0, 0))))
 		    && operand_equal_p (tree01, tree111, 0))
-		  return build2 ((code0 == LSHIFT_EXPR
-				  ? LROTATE_EXPR
-				  : RROTATE_EXPR),
-				 type, TREE_OPERAND (arg0, 0), tree01);
+		  return fold_convert (type,
+				       build2 ((code0 == LSHIFT_EXPR
+						? LROTATE_EXPR
+						: RROTATE_EXPR),
+					       TREE_TYPE (TREE_OPERAND (arg0, 0)),
+					       TREE_OPERAND (arg0, 0), tree01));
 	      }
 	    else if (code01 == MINUS_EXPR)
 	      {
@@ -10208,10 +10214,12 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
 					      (TREE_TYPE (TREE_OPERAND
 							  (arg0, 0))))
 		    && operand_equal_p (tree11, tree011, 0))
-		  return build2 ((code0 != LSHIFT_EXPR
-				  ? LROTATE_EXPR
-				  : RROTATE_EXPR),
-				 type, TREE_OPERAND (arg0, 0), tree11);
+		  return fold_convert (type,
+				       build2 ((code0 != LSHIFT_EXPR
+						? LROTATE_EXPR
+						: RROTATE_EXPR),
+					       TREE_TYPE (TREE_OPERAND (arg0, 0)),
+					       TREE_OPERAND (arg0, 0), tree11));
 	      }
 	  }
       }

gcc/testsuite/ChangeLog

+2009-05-26  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/40252
+	* gcc.c-torture/compile/pr40252.c: New testcase.
+
 2009-05-26  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/40007

gcc/testsuite/gcc.c-torture/compile/pr40252.c

+typedef unsigned int uint32_t;
+static void IP(uint32_t v[2])
+{
+    v[0] = ((v[0] << 1) | ((v[0] >> 31) & 1L)) & 0xffffffffL;
+}
+