aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/internal-fn.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/vect/pr84419.c21
4 files changed, 37 insertions, 1 deletions
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 <richard.sandiford@linaro.org>
+
+ 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 <jakub@redhat.com>
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 <richard.sandiford@linaro.org>
+
+ PR tree-optimization/84419
+ * gcc.dg/vect/pr84419.c: New test.
+
2018-02-20 Jakub Jelinek <jakub@redhat.com>
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 <string.h>
+
+#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;
+}