re PR tree-optimization/52636 (ICE: tree check: expected integer_cst, have…

re PR tree-optimization/52636 (ICE: tree check: expected integer_cst, have string_cst in tree_to_double_int, at tree.h:4324)

2012-03-21  Richard Guenther  <rguenther@suse.de>

	PR tree-optimizer/52636
	* tree-vect-slp.c (vect_get_constant_vectors): Convert constants
	to the appropriate type.

From-SVN: r185599

gcc/ChangeLog

 2012-03-21  Richard Guenther  <rguenther@suse.de>
 
+	PR tree-optimizer/52636
+	* tree-vect-slp.c (vect_get_constant_vectors): Convert constants
+	to the appropriate type.
+
+2012-03-21  Richard Guenther  <rguenther@suse.de>
+
 	* Makefile.in (cfgexpand.o): Add $(REGS_H) and $(INTEGRATE_H)
 	dependencies.
 	* cfgexpand.c (gimple_expand_cfg): Fold in pass_init_function,

gcc/tree-vect-slp.c

@@ -2363,6 +2363,12 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
 
           /* Create 'vect_ = {op0,op1,...,opn}'.  */
           number_of_places_left_in_vector--;
+	  if (constant_p
+	      && !types_compatible_p (TREE_TYPE (vector_type), TREE_TYPE (op)))
+	    {
+	      op = fold_unary (VIEW_CONVERT_EXPR, TREE_TYPE (vector_type), op);
+	      gcc_assert (op && CONSTANT_CLASS_P (op));
+	    }
 	  elts[number_of_places_left_in_vector] = op;
 
           if (number_of_places_left_in_vector == 0)