From 6c0b8df123c24ef3c14305698eb2910bcf5979ce Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 9 Apr 2019 07:50:51 +0000 Subject: SVE fallout from PR90006 2019-04-08 Richard Sandiford gcc/ * tree-vect-data-refs.c (vect_get_smallest_scalar_type): Always use gimple_expr_type for load and store calls. Skip over the condition argument in a conditional internal function. Protect use of TREE_INT_CST_LOW. From-SVN: r270222 --- gcc/tree-vect-data-refs.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'gcc/tree-vect-data-refs.c') diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 8f185c9..271cb58 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -145,14 +145,29 @@ vect_get_smallest_scalar_type (stmt_vec_info stmt_info, if (rhs < lhs) scalar_type = rhs_type; } - else if (is_gimple_call (stmt_info->stmt) - && gimple_call_num_args (stmt_info->stmt) > 0) + else if (gcall *call = dyn_cast (stmt_info->stmt)) { - tree rhs_type = TREE_TYPE (gimple_call_arg (stmt_info->stmt, 0)); - - rhs = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (rhs_type)); - if (rhs < lhs) - scalar_type = rhs_type; + unsigned int i = 0; + if (gimple_call_internal_p (call)) + { + internal_fn ifn = gimple_call_internal_fn (call); + if (internal_load_fn_p (ifn) || internal_store_fn_p (ifn)) + /* gimple_expr_type already picked the type of the loaded + or stored data. */ + i = ~0U; + else if (internal_fn_mask_index (ifn) == 0) + i = 1; + } + if (i < gimple_call_num_args (call)) + { + tree rhs_type = TREE_TYPE (gimple_call_arg (call, i)); + if (tree_fits_uhwi_p (TYPE_SIZE_UNIT (rhs_type))) + { + rhs = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (rhs_type)); + if (rhs < lhs) + scalar_type = rhs_type; + } + } } *lhs_size_unit = lhs; -- cgit v1.1