From cf736b092afeabe90680443794eb384a9f930cd5 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 12 Jan 2018 14:48:35 +0000 Subject: [PATCH] Handle poly_int vector sizes in get_vec_alignment_for_array_type get_vectype_for_scalar_type returns a variable-length vector type for SVE, whereas get_vec_alignment_for_array_type assumed it would always be an INTEGER_CST. This is needed to build libstdc++-v3/src/closures.cc for SVE (and probably many other places besides -- this was just the first hit). 2018-01-12 Richard Sandiford gcc/ * tree-vectorizer.c (get_vec_alignment_for_array_type): Handle polynomial type sizes. From-SVN: r256586 --- gcc/ChangeLog | 5 +++++ gcc/tree-vectorizer.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 823f39d1d87..7195a2a729f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-01-12 Richard Sandiford + + * tree-vectorizer.c (get_vec_alignment_for_array_type): Handle + polynomial type sizes. + 2018-01-12 Richard Sandiford * gimplify.c (gimple_add_tmp_var_fn): Allow variables to have a diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index b5bdf676881..a0cc2d6bddb 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -1015,12 +1015,13 @@ static unsigned get_vec_alignment_for_array_type (tree type) { gcc_assert (TREE_CODE (type) == ARRAY_TYPE); + poly_uint64 array_size, vector_size; tree vectype = get_vectype_for_scalar_type (strip_array_types (type)); if (!vectype - || !TYPE_SIZE (type) - || TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST - || tree_int_cst_lt (TYPE_SIZE (type), TYPE_SIZE (vectype))) + || !poly_int_tree_p (TYPE_SIZE (type), &array_size) + || !poly_int_tree_p (TYPE_SIZE (vectype), &vector_size) + || maybe_lt (array_size, vector_size)) return 0; return TYPE_ALIGN (vectype); -- 2.30.2