From 273ccb6d858543fec05d2fc9c0bf5de92a6c6fd1 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 3 May 2012 12:18:34 +0200 Subject: [PATCH] re PR debug/53174 (ICE in expand_debug_expr, verify_ssa failed) PR debug/53174 * tree-predcom.c (remove_stmt): Call reset_debug_uses on stmts being removed. * gcc.dg/pr53174.c: New test. From-SVN: r187087 --- gcc/ChangeLog | 4 ++ gcc/testsuite/ChangeLog | 3 ++ gcc/testsuite/gcc.dg/pr53174.c | 67 ++++++++++++++++++++++++++++++++++ gcc/tree-predcom.c | 2 + 4 files changed, 76 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr53174.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80cf8c050e6..75df2531e02 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2012-05-03 Jakub Jelinek + PR debug/53174 + * tree-predcom.c (remove_stmt): Call reset_debug_uses on stmts being + removed. + PR target/53187 * config/arm/arm.c (arm_select_cc_mode): If x has MODE_CC class mode, return that mode. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a56a5be2ed..776e9884119 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2012-05-03 Jakub Jelinek + PR debug/53174 + * gcc.dg/pr53174.c: New test. + PR target/53187 * gcc.target/arm/pr53187.c: New test. * gcc.c-torture/compile/pr53187.c: New test. diff --git a/gcc/testsuite/gcc.dg/pr53174.c b/gcc/testsuite/gcc.dg/pr53174.c new file mode 100644 index 00000000000..37c9390e5f7 --- /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 bef5252923e..1566902e3d7 100644 --- a/gcc/tree-predcom.c +++ b/gcc/tree-predcom.c @@ -1707,6 +1707,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); @@ -1728,6 +1729,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); -- 2.30.2