2010-12-09 Martin Jambor <mjambor@suse.cz>

	PR middle-end/46734
	* tree-sra.c (splice_param_accesses): Check that there are not
	multiple ADDRESSABLE types.

	* testsuite/g++.dg/tree-ssa/pr46734.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167639 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 120388f..47e2b86 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-09  Martin Jambor  <mjambor@suse.cz>
+
+       PR middle-end/46734
+       * tree-sra.c (splice_param_accesses): Check that there are not
+       multiple ADDRESSABLE types.
+
 2010-12-09  Joseph Myers  <joseph@codesourcery.com>
 
        * config/arc/arc.h (ASM_SPEC): Remove %{v}.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6cbd7ae..eb32b49 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-09  Martin Jambor  <mjambor@suse.cz>
+
+       PR middle-end/46734
+       * g++.dg/tree-ssa/pr46734.C: New test.
+
 2010-12-09  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        PR c++/44641

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr46734.C b/gcc/testsuite/g++.dg/tree-ssa/pr46734.C
new file mode 100644 (file)
index 0000000..e95c620
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr46734.C
@@ -0,0 +1,34 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fipa-sra" } */
+
+struct A
+{
+  int *p;
+  A() {p = (int *) -1;}
+  ~A() {if (p && p != (int *) -1) *p = 0;}
+};
+
+struct B
+{
+  A a;
+  char data[23];
+  B() : a() {data[0] = 0;}
+};
+
+extern A ga;
+extern int *gi;
+extern void *gz;
+extern B *gb;
+
+static int * __attribute__ ((noinline)) foo (B *b, void *z)
+{
+  __builtin_memcpy (gz, z, 28);
+  ga = b->a;
+  return b->a.p;
+}
+
+int *bar (B *b, void *z)
+{
+  gb = b;
+  return foo (b, z);
+}

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index c06ca8e..4330a17 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -3587,7 +3587,10 @@ splice_param_accesses (tree parm, bool *ro_grp)
          else if (ac2->size != access->size)
            return NULL;
 
-         if (access_precludes_ipa_sra_p (ac2))
+         if (access_precludes_ipa_sra_p (ac2)
+             || (ac2->type != access->type
+                 && (TREE_ADDRESSABLE (ac2->type)
+                     || TREE_ADDRESSABLE (access->type))))
            return NULL;
 
          modification |= ac2->write;