From ace64c064cf3d0dc797f3338fcda24840ba0eabc Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 16 Mar 2012 13:20:55 +0000 Subject: [PATCH] 2012-03-16 Richard Guenther * tree-vect-stmts.c (vect_get_vec_def_for_operand): Use VIEW_CONVERT_EXPR to convert constants. (vect_is_simple_use): Treat all constants as vec_constant_def. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185466 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/tree-vect-stmts.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e18d220..d246b85 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,10 @@ 2012-03-16 Richard Guenther + + * tree-vect-stmts.c (vect_get_vec_def_for_operand): Use + VIEW_CONVERT_EXPR to convert constants. + (vect_is_simple_use): Treat all constants as vec_constant_def. + +2012-03-16 Richard Guenther Kai Tietz PR middle-end/48814 diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 8a1c678..c941e15 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -1271,9 +1271,13 @@ vect_get_vec_def_for_operand (tree op, gimple stmt, tree *scalar_def) if (vect_print_dump_info (REPORT_DETAILS)) fprintf (vect_dump, "Create vector_cst. nunits = %d", nunits); - vec_cst = build_vector_from_val (vector_type, - fold_convert (TREE_TYPE (vector_type), - op)); + if (!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)); + } + + vec_cst = build_vector_from_val (vector_type, op); return vect_init_vector (stmt, vec_cst, vector_type, NULL); } @@ -5909,7 +5913,7 @@ vect_is_simple_use (tree operand, gimple stmt, loop_vec_info loop_vinfo, print_generic_expr (vect_dump, operand, TDF_SLIM); } - if (TREE_CODE (operand) == INTEGER_CST || TREE_CODE (operand) == REAL_CST) + if (CONSTANT_CLASS_P (operand)) { *dt = vect_constant_def; return true; -- 2.7.4