aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2010-12-13 03:08:06 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2010-12-13 03:08:06 +0000
commit11321111221bd6f8ce17c254452132a6fbd5abd7 (patch)
tree9003b88e1c055be42fd5dbdcc718b461c42629c0 /gcc
parent6930a9f664805681ba354af8378cef2ed9d661a1 (diff)
downloadgcc-11321111221bd6f8ce17c254452132a6fbd5abd7.zip
gcc-11321111221bd6f8ce17c254452132a6fbd5abd7.tar.gz
gcc-11321111221bd6f8ce17c254452132a6fbd5abd7.tar.bz2
re PR debug/46782 (-fcompare-debug failure (length) with -fvar-tracking)
gcc/ChangeLog: PR debug/46782 * cfgcleanup.c (try_forward_edges): Skip debug insns. gcc/testsuite/ChangeLog: PR debug/46782 * gcc.dg/debug/pr46782.c: New. From-SVN: r167737
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cfgcleanup.c10
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/debug/pr46782.c11
4 files changed, 29 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73329a8..92397f1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13 Alexandre Oliva <aoliva@redhat.com>
+
+ PR debug/46782
+ * cfgcleanup.c (try_forward_edges): Skip debug insns.
+
2010-12-12 Jan Hubicka <jh@suse.cz>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index c365b5e..78635d2 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -487,11 +487,17 @@ try_forward_edges (int mode, basic_block b)
new_target = NULL;
else
{
+ rtx last;
+
if (new_locus)
locus = new_locus;
- new_locus = INSN_P (BB_END (target))
- ? INSN_LOCATOR (BB_END (target)) : 0;
+ last = BB_END (target);
+ if (DEBUG_INSN_P (last))
+ last = prev_nondebug_insn (last);
+
+ new_locus = last && INSN_P (last)
+ ? INSN_LOCATOR (last) : 0;
if (new_locus && locus && !locator_eq (new_locus, locus))
new_target = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5cf2c03..05a4341 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-13 Alexandre Oliva <aoliva@redhat.com>
+
+ PR debug/46782
+ * gcc.dg/debug/pr46782.c: New.
+
2010-12-12 Janus Weil <janus@gcc.gnu.org>
PR fortran/46809
diff --git a/gcc/testsuite/gcc.dg/debug/pr46782.c b/gcc/testsuite/gcc.dg/debug/pr46782.c
new file mode 100644
index 0000000..1603b09
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/pr46782.c
@@ -0,0 +1,11 @@
+/* PR debug/46782 */
+/* { dg-do compile } */
+/* { dg-options "-w -O0 -fvar-tracking -fcompare-debug" } */
+
+void foo (int i)
+{
+ if (i)
+ i++;
+ while (i)
+ ;
+}