From c563bcd1da29d2a3a107e39eb894427042df5973 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 6 Nov 2007 09:28:37 +0100 Subject: [PATCH] re PR tree-optimization/33993 (ICE: verify_stmts failed (invalid reference prefix)) PR tree-optimization/33993 * tree-vect-transform.c (vect_get_constant_vectors): Use build_vector rather than build_constructor_from_list if all list values are constants. (get_initial_def_for_induction): Use build_vector instead of build_constructor_from_list. * gcc.c-torture/compile/20071105-1.c: New test. From-SVN: r129920 --- gcc/ChangeLog | 9 +++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/20071105-1.c | 11 +++++++++++ gcc/tree-vect-transform.c | 16 +++++++++++++--- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/20071105-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b9d370ed9e16..38237bf3d881 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2007-11-06 Jakub Jelinek + + PR tree-optimization/33993 + * tree-vect-transform.c (vect_get_constant_vectors): Use build_vector + rather than build_constructor_from_list if all list values are + constants. + (get_initial_def_for_induction): Use build_vector instead of + build_constructor_from_list. + 2007-11-05 Mark Mitchell PR target/33579 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e08a6f39eb83..54974ace16e7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-06 Jakub Jelinek + + PR tree-optimization/33993 + * gcc.c-torture/compile/20071105-1.c: New test. + 2007-11-05 Jakub Jelinek PR rtl-optimization/33648 diff --git a/gcc/testsuite/gcc.c-torture/compile/20071105-1.c b/gcc/testsuite/gcc.c-torture/compile/20071105-1.c new file mode 100644 index 000000000000..952b1bd697dc --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20071105-1.c @@ -0,0 +1,11 @@ +/* PR tree-optimization/33993 */ +/* Testcase by Martin Michlmayr */ + +void +init_full (char *array, int ny) +{ + int j; + char acc = 128; + for (j = 0; j < ny; j++) + *array++ = acc++; +} diff --git a/gcc/tree-vect-transform.c b/gcc/tree-vect-transform.c index 2cdc79b28e5a..736f0c9687db 100644 --- a/gcc/tree-vect-transform.c +++ b/gcc/tree-vect-transform.c @@ -1318,6 +1318,7 @@ vect_get_constant_vectors (slp_tree slp_node, VEC(tree,heap) **vec_oprnds, bool is_store = false; unsigned int number_of_vectors = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node); VEC (tree, heap) *voprnds = VEC_alloc (tree, heap, number_of_vectors); + bool constant_p; if (STMT_VINFO_DATA_REF (stmt_vinfo)) is_store = true; @@ -1341,6 +1342,7 @@ vect_get_constant_vectors (slp_tree slp_node, VEC(tree,heap) **vec_oprnds, number_of_copies = least_common_multiple (nunits, group_size) / group_size; number_of_places_left_in_vector = nunits; + constant_p = true; for (j = 0; j < number_of_copies; j++) { for (i = group_size - 1; VEC_iterate (tree, stmts, i, stmt); i--) @@ -1350,6 +1352,8 @@ vect_get_constant_vectors (slp_tree slp_node, VEC(tree,heap) **vec_oprnds, op = operation; else op = TREE_OPERAND (operation, op_num); + if (!CONSTANT_CLASS_P (op)) + constant_p = false; /* Create 'vect_ = {op0,op1,...,opn}'. */ t = tree_cons (NULL_TREE, op, t); @@ -1362,7 +1366,11 @@ vect_get_constant_vectors (slp_tree slp_node, VEC(tree,heap) **vec_oprnds, vector_type = get_vectype_for_scalar_type (TREE_TYPE (op)); gcc_assert (vector_type); - vec_cst = build_constructor_from_list (vector_type, t); + if (constant_p) + vec_cst = build_vector (vector_type, t); + else + vec_cst = build_constructor_from_list (vector_type, t); + constant_p = true; VEC_quick_push (tree, voprnds, vect_init_vector (stmt, vec_cst, vector_type, NULL)); @@ -1617,7 +1625,8 @@ get_initial_def_for_induction (tree iv_phi) t = NULL_TREE; for (i = 0; i < nunits; i++) t = tree_cons (NULL_TREE, unshare_expr (new_name), t); - vec = build_constructor_from_list (vectype, t); + gcc_assert (CONSTANT_CLASS_P (new_name)); + vec = build_vector (vectype, t); vec_step = vect_init_vector (iv_phi, vec, vectype, NULL); @@ -1673,7 +1682,8 @@ get_initial_def_for_induction (tree iv_phi) t = NULL_TREE; for (i = 0; i < nunits; i++) t = tree_cons (NULL_TREE, unshare_expr (new_name), t); - vec = build_constructor_from_list (vectype, t); + gcc_assert (CONSTANT_CLASS_P (new_name)); + vec = build_vector (vectype, t); vec_step = vect_init_vector (iv_phi, vec, vectype, NULL); vec_def = induc_def;