re PR middle-end/52693 (Wrong code with SRA and arrays)

2012-03-28  Martin Jambor  <mjambor@suse.cz>

	PR middle-end/52693
	* tree-sra.c (sra_modify_assign): Do not call
	load_assign_lhs_subreplacements when working with an unscalarizable
	region.

	* testsuite/gcc.dg/torture/pr52693.c: New test.

From-SVN: r185923

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f65d4c842c2a8b64e348e1e30060b191802f0fdc..7e92423998bc44ad1957669d9b9e9823f0e95ddf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-28  Martin Jambor  <mjambor@suse.cz>
+
+       Backported from mainline
+       2012-03-27  Martin Jambor  <mjambor@suse.cz>
+
+       PR middle-end/52693
+       * tree-sra.c (sra_modify_assign): Do not call
+       load_assign_lhs_subreplacements when working with an unscalarizable
+       region.
+
 2012-03-24  Steven Bosscher  <steven@gcc.gnu.org>
 
        PR middle-end/52640

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fba45bf085676051f87adb63496b7f05cc7f3df5..ca046fcaef5a51820cb00b38f76beddbd0c13f6f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-28  Martin Jambor  <mjambor@suse.cz>
+
+       Backported from mainline
+       2012-03-27  Martin Jambor  <mjambor@suse.cz>
+
+       PR middle-end/52693
+       * gcc.dg/torture/pr52693.c: New test.
+
 2012-03-24  Steven Bosscher  <steven@gcc.gnu.org>
 
        PR middle-end/52640

diff --git a/gcc/testsuite/gcc.dg/torture/pr52693.c b/gcc/testsuite/gcc.dg/torture/pr52693.c
new file mode 100644 (file)
index 0000000..93e0680
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr52693.c
@@ -0,0 +1,33 @@
+/* { dg-do run } */
+
+struct pair
+{
+  int x;
+  int y;
+};
+
+struct array
+{
+  struct pair elems[ 2 ];
+  unsigned index;
+};
+
+extern void abort ();
+
+void __attribute__ ((noinline,noclone))
+test_results (int x1, int y1, int x2, int y2)
+{
+  if (x1 != x2 || y1 != y2)
+    abort ();
+}
+
+int
+main (void)
+{
+  struct array arr = {{{1,2}, {3,4}}, 1};
+  struct pair last = arr.elems[arr.index];
+
+  test_results ( last.x, last.y, arr.elems[1].x, arr.elems[1].y);
+
+  return 0;
+}

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index c48ee62686dea5df410ffc0240e158da28f4beec..40a57bea085e9091392ba915d6ddbcfa9434a63c 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2743,7 +2743,13 @@ sra_modify_assign (gimple *stmt, gimple_stmt_iterator *gsi,
     }
   else
     {
-      if (access_has_children_p (lacc) && access_has_children_p (racc))
+      if (access_has_children_p (lacc)
+         && access_has_children_p (racc)
+         /* When an access represents an unscalarizable region, it usually
+            represents accesses with variable offset and thus must not be used
+            to generate new memory accesses.  */
+         && !lacc->grp_unscalarizable_region
+         && !racc->grp_unscalarizable_region)
        {
          gimple_stmt_iterator orig_gsi = *gsi;
          enum unscalarized_data_handling refreshed;