re PR tree-optimization/58958 (Wrong aliasing info for variable index)

2013-11-05  Marc Glisse  <marc.glisse@inria.fr>

	PR tree-optimization/58958
gcc/
	* 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.

gcc/testsuite/
	* gcc.dg/tree-ssa/pr58958.c: New file.

From-SVN: r204389

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9044a6c9058a3636a99e685b2880b6e9fd8d7bf7..4b639e03bda00fb09e2ba999dc1c78ed6298383e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9235430b8e51ae2d8be1be86c6c403d9316eadb8..b33fcad60da01400bceae04b5c262de5cef65ff3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c b/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
new file mode 100644 (file)
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 6f7e8534803813c7005b7b6d9dc08c575be2049d..278599591e6be3adc0a74c83f098d5fdcbdf46ec 100644 (file)
--- 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,