From 11321111221bd6f8ce17c254452132a6fbd5abd7 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 13 Dec 2010 03:08:06 +0000
Subject: [PATCH] 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
---
 gcc/ChangeLog                        |  5 +++++
 gcc/cfgcleanup.c                     | 10 ++++++++--
 gcc/testsuite/ChangeLog              |  5 +++++
 gcc/testsuite/gcc.dg/debug/pr46782.c | 11 +++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/debug/pr46782.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73329a8c3ab..92397f12d87 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 c365b5e8a2d..78635d23a55 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 5cf2c03fdee..05a43413443 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 00000000000..1603b0922c2
--- /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)
+    ;
+}