PR tree-optimization/53163

	* tree-ssa-phiopt.c (cond_if_else_store_replacement): Don't ignore
	return value from compute_all_dependences.

	* gcc.c-torture/compile/pr53163.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187039 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f5f0a71e478339e348361eeb43fb769d6b698d2..102e3eaafb6b29abdcb9dde28c82fa7d891e4a0e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-02  Jakub Jelinek  <jakub@redhat.com>
 
+       PR tree-optimization/53163
+       * tree-ssa-phiopt.c (cond_if_else_store_replacement): Don't ignore
+       return value from compute_all_dependences.
+
        PR rtl-optimization/53160
        * ree.c (combine_reaching_defs): Handle the case where cand->insn
        has been modified by ree pass already.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aeb17f70358d6a21052dedf0a63d719040fff889..3c4c138d040e073d680f3068c526bf5bd21946cf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-02  Jakub Jelinek  <jakub@redhat.com>
 
+       PR tree-optimization/53163
+       * gcc.c-torture/compile/pr53163.c: New test.
+
        PR rtl-optimization/53160
        * gcc.c-torture/execute/pr53160.c: New test.
 

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr53163.c b/gcc/testsuite/gcc.c-torture/compile/pr53163.c
new file mode 100644 (file)
index 0000000..990b113
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr53163.c
@@ -0,0 +1,34 @@
+/* PR tree-optimization/53163 */
+
+struct S { int s; } b, f;
+int a, c;
+
+void
+foo (void)
+{
+  int d, e;
+  for (d = 4; d < 19; ++d)
+    for (e = 2; e >= 0; e--)
+      {
+       a = 0;
+       a = 1;
+      }
+}
+
+void
+bar (void)
+{
+  int g, h, i;
+  for (i = 1; i >= 0; i--)
+    {
+      b = f;
+      for (g = 0; g <= 1; g++)
+       {
+         if (c)
+           break;
+         for (h = 0; h <= 1; h++)
+           foo ();
+         foo ();
+       }
+    }
+}

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 0cef8ee39af11d9673cb99ed19fcff31c581742c..d4019c06431371d562827b2582123fe67f34dff2 100644 (file)
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -1556,8 +1556,17 @@ cond_if_else_store_replacement (basic_block then_bb, basic_block else_bb,
   /* Compute and check data dependencies in both basic blocks.  */
   then_ddrs = VEC_alloc (ddr_p, heap, 1);
   else_ddrs = VEC_alloc (ddr_p, heap, 1);
-  compute_all_dependences (then_datarefs, &then_ddrs, NULL, false);
-  compute_all_dependences (else_datarefs, &else_ddrs, NULL, false);
+  if (!compute_all_dependences (then_datarefs, &then_ddrs, NULL, false)
+      || !compute_all_dependences (else_datarefs, &else_ddrs, NULL, false))
+    {
+      free_dependence_relations (then_ddrs);
+      free_dependence_relations (else_ddrs);
+      free_data_refs (then_datarefs);
+      free_data_refs (else_datarefs);
+      VEC_free (gimple, heap, then_stores);
+      VEC_free (gimple, heap, else_stores);
+      return false;
+    }
   blocks[0] = then_bb;
   blocks[1] = else_bb;
   blocks[2] = join_bb;