From 9bd958c5f361337b15958be8641d59ad38bd0a2b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 20 Feb 2018 14:44:24 +0000 Subject: [PATCH] Fix incorrect TARGET_MEM_REF alignment (PR 84419) expand_call_mem_ref checks for TARGET_MEM_REFs that have compatible type, but it didn't then go on to install the specific type we need, which might have different alignment due to: if (TYPE_ALIGN (type) != align) type = build_aligned_type (type, align); This was causing masked stores to be incorrectly marked as aligned on AVX512. 2018-02-20 Richard Sandiford gcc/ PR tree-optimization/84419 * internal-fn.c (expand_call_mem_ref): Create a TARGET_MEM_REF with the required type if its current type is compatible but different. gcc/testsuite/ PR tree-optimization/84419 * gcc.dg/vect/pr84419.c: New test. From-SVN: r257847 --- gcc/ChangeLog | 7 +++++++ gcc/internal-fn.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/vect/pr84419.c | 21 +++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/vect/pr84419.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b485a92..2c679c9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-02-20 Richard Sandiford + + PR tree-optimization/84419 + * internal-fn.c (expand_call_mem_ref): Create a TARGET_MEM_REF + with the required type if its current type is compatible but + different. + 2018-02-20 Jakub Jelinek PR middle-end/82004 diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c index 88adaea..da205c9 100644 --- a/gcc/internal-fn.c +++ b/gcc/internal-fn.c @@ -2444,11 +2444,14 @@ expand_call_mem_ref (tree type, gcall *stmt, int index) && types_compatible_p (TREE_TYPE (mem), type)) { tree offset = TMR_OFFSET (mem); - if (alias_ptr_type != TREE_TYPE (offset) || !integer_zerop (offset)) + if (type != TREE_TYPE (mem) + || alias_ptr_type != TREE_TYPE (offset) + || !integer_zerop (offset)) { mem = copy_node (mem); TMR_OFFSET (mem) = wide_int_to_tree (alias_ptr_type, wi::to_poly_wide (offset)); + TREE_TYPE (mem) = type; } return mem; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95f06bf..8eb50db 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-20 Richard Sandiford + + PR tree-optimization/84419 + * gcc.dg/vect/pr84419.c: New test. + 2018-02-20 Jakub Jelinek PR middle-end/82004 diff --git a/gcc/testsuite/gcc.dg/vect/pr84419.c b/gcc/testsuite/gcc.dg/vect/pr84419.c new file mode 100644 index 0000000..4864f8e --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr84419.c @@ -0,0 +1,21 @@ +#include + +#define SIZE 400 + +int foo[SIZE]; +char bar[SIZE]; + +void __attribute__ ((noinline)) foo_func(void) +{ + int i; + for (i = 1; i < SIZE; i++) + if (bar[i]) + foo[i] = 1; +} + +int main() +{ + memset(bar, 1, sizeof(bar)); + foo_func(); + return 0; +} -- 2.7.4