backport: re PR debug/53174 (ICE in expand_debug_expr, verify_ssa failed)

	Backported from mainline
	2012-05-03  Jakub Jelinek  <jakub@redhat.com>

	PR debug/53174
	* tree-predcom.c (remove_stmt): Call reset_debug_uses on stmts being
	removed.

	* gcc.dg/pr53174.c: New test.

From-SVN: r197442

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31f944eefd58e03909dcd3b1a223873e04700dca..3f20bcd1f9f4ee968deecdf6d71e6649551ad92a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2013-04-03  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2012-05-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+       PR debug/53174
+       * tree-predcom.c (remove_stmt): Call reset_debug_uses on stmts being
+       removed.
+
        2012-03-22  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/52547

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d32b95420b3213e97ffcbdcf1d37ae74683195c6..d6802836494fe9033f74fe0f22b18148fb152ec7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2013-04-03  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2012-05-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+       PR debug/53174
+       * gcc.dg/pr53174.c: New test.
+
        2012-03-01  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/52445

diff --git a/gcc/testsuite/gcc.dg/pr53174.c b/gcc/testsuite/gcc.dg/pr53174.c
new file mode 100644 (file)
index 0000000..37c9390
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr53174.c
@@ -0,0 +1,67 @@
+/* PR debug/53174 */
+/* { dg-do compile } */
+/* { dg-options "-Ofast -g" } */
+
+int w, h;
+
+void
+bar (float (*x)[4], int y, int z)
+{
+  int a, b, c, d, e, f, g;
+
+  a = 2;
+  b = 2;
+  c = 274;
+  d = 274;
+  if (!z)
+    a = 12;
+  if (!y)
+    b = 12;
+  if (z + 266 >= h - 2)
+    c = 8 + h - z;
+  if (y + 266 >= w - 2)
+    d = 8 + w - y;
+  for (e = a; e < c; e++)
+    for (f = b, g = e * 276 + f; f < d; f++, g++)
+      {
+       float (*h)[4] = x + (g - 277);
+       float k = (*h)[0];
+       float l = (*h)[1];
+       float m = (*h)[2];
+       h++;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h++;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h += 274;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h += 2;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h += 274;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h++;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       h++;
+       k += (*h)[0];
+       l += (*h)[1];
+       m += (*h)[2];
+       k *= 0.125f;
+       l *= 0.125f;
+       m *= 0.125f;
+       k = k + (x[g][1] - l);
+       m = m + (x[g][1] - l);
+       x[g][0] = k;
+       x[g][2] = m;
+      }
+}

diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 2dbd07d135af6669d766d703f9bd59f8c35a07e7..e9e20f9d3f8985655fc8e3ff9fbcf9ce89ae6e85 100644 (file)
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -1693,6 +1693,7 @@ remove_stmt (gimple stmt)
     {
       name = PHI_RESULT (stmt);
       next = single_nonlooparound_use (name);
+      reset_debug_uses (stmt);
       psi = gsi_for_stmt (stmt);
       remove_phi_node (&psi, true);
 
@@ -1714,6 +1715,7 @@ remove_stmt (gimple stmt)
       gcc_assert (TREE_CODE (name) == SSA_NAME);
 
       next = single_nonlooparound_use (name);
+      reset_debug_uses (stmt);
 
       mark_virtual_ops_for_renaming (stmt);
       gsi_remove (&bsi, true);