From: Martin Jambor <mjambor@suse.cz>
Date: Tue, 27 Mar 2012 18:22:39 +0000 (+0200)
Subject: re PR middle-end/52693 (Wrong code with SRA and arrays)
X-Git-Tag: upstream/12.2.0~77178
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=429576acea5fd549984cecf8e0a899c37fc6e8b4;p=platform%2Fupstream%2Fgcc.git

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

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.

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

From-SVN: r185891
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0fd793..729f51f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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-27  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/52698
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c69953..6231db2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-27  Martin Jambor  <mjambor@suse.cz>
+
+	PR middle-end/52693
+	* gcc.dg/torture/pr52693.c: New test.
+
 2012-03-27  Meador Inge  <meadori@codesourcery.com>
 
 	PR c++/52672
diff --git a/gcc/testsuite/gcc.dg/torture/pr52693.c b/gcc/testsuite/gcc.dg/torture/pr52693.c
new file mode 100644
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 4d1aa5f..84dc3be 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -3071,7 +3071,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;