aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr58958.c12
-rw-r--r--gcc/tree-ssa-alias.c15
4 files changed, 35 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9044a6c..4b639e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2013-11-05 Marc Glisse <marc.glisse@inria.fr>
+ PR tree-optimization/58958
+ * tree-ssa-alias.c (ao_ref_init_from_ptr_and_size): Use
+ get_addr_base_and_unit_offset instead of get_ref_base_and_extent.
+
+2013-11-05 Marc Glisse <marc.glisse@inria.fr>
+
* tree-ssa-alias.h (ranges_overlap_p): Handle negative offsets.
* tree-ssa-alias.c (ao_ref_init_from_ptr_and_size): Likewise.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9235430..b33fcad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2013-11-05 Marc Glisse <marc.glisse@inria.fr>
+ PR tree-optimization/58958
+ * gcc.dg/tree-ssa/pr58958.c: New file.
+
+2013-11-05 Marc Glisse <marc.glisse@inria.fr>
+
* gcc.dg/tree-ssa/alias-26.c: New file.
2013-11-05 Jakub Jelinek <jakub@redhat.com>
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c b/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
new file mode 100644
index 0000000..faf377f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+double a[10];
+int f(int n){
+ a[3]=9;
+ __builtin_memset(&a[n],3,sizeof(double));
+ return a[3]==9;
+}
+
+/* { dg-final { scan-tree-dump " == 9" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 6f7e853..2785995 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -566,7 +566,7 @@ ao_ref_alias_set (ao_ref *ref)
void
ao_ref_init_from_ptr_and_size (ao_ref *ref, tree ptr, tree size)
{
- HOST_WIDE_INT t1, t2, extra_offset = 0;
+ HOST_WIDE_INT t, extra_offset = 0;
ref->ref = NULL_TREE;
if (TREE_CODE (ptr) == SSA_NAME)
{
@@ -585,8 +585,17 @@ ao_ref_init_from_ptr_and_size (ao_ref *ref, tree ptr, tree size)
}
if (TREE_CODE (ptr) == ADDR_EXPR)
- ref->base = get_ref_base_and_extent (TREE_OPERAND (ptr, 0),
- &ref->offset, &t1, &t2);
+ {
+ ref->base = get_addr_base_and_unit_offset (TREE_OPERAND (ptr, 0), &t);
+ if (ref->base)
+ ref->offset = BITS_PER_UNIT * t;
+ else
+ {
+ size = NULL_TREE;
+ ref->offset = 0;
+ ref->base = get_base_address (TREE_OPERAND (ptr, 0));
+ }
+ }
else
{
ref->base = build2 (MEM_REF, char_type_node,