From 61dc0ea735b12329bcb88eeb1e11255f86b295f7 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 29 Oct 2012 19:36:47 +0000
Subject: [PATCH] re PR debug/54693 (VTA guality issues with loops)

gcc/ChangeLog:
PR debug/54693
* tree-ssa-threadedge.c (thread_around_empty_block): Copy
debug temps from predecessor before threading.
gcc/testsuite/ChangeLog:
PR debug/54693
* gcc.dg/guality/pr54693.c: New.

From-SVN: r192961
---
 gcc/ChangeLog                          |  6 ++++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gcc.dg/guality/pr54693.c | 28 ++++++++++++++++++++++++++
 gcc/tree-ssa-threadedge.c              | 18 +++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/guality/pr54693.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8422ca06275..491128e1aa7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-29  Alexandre Oliva <aoliva@redhat.com>
+
+	PR debug/54693
+	* tree-ssa-threadedge.c (thread_around_empty_block): Copy
+	debug temps from predecessor before threading.
+
 2012-10-29  Alexandre Oliva <aoliva@redhat.com>
 
 	PR debug/54551
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c0124d4f1a..c6899df3c95 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-29  Alexandre Oliva <aoliva@redhat.com>
+
+	PR debug/54693
+	* gcc.dg/guality/pr54693.c: New.
+
 2012-10-29  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR middle-end/55027
diff --git a/gcc/testsuite/gcc.dg/guality/pr54693.c b/gcc/testsuite/gcc.dg/guality/pr54693.c
new file mode 100644
index 00000000000..adc2dfd0326
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/guality/pr54693.c
@@ -0,0 +1,28 @@
+/* PR debug/54693 */
+/* { dg-do run } */
+/* { dg-options "-g" } */
+
+__attribute__((noinline, noclone)) void
+foo (char *str, char c)
+{
+  asm volatile ("" : : "r" (str), "r" (c) : "memory");
+  *str = c;
+}
+
+int
+main ()
+{
+  int i;
+  char c;
+  char arr[11];
+
+  for (i = 0; i < 10; i++)
+    {
+      c = 0x30 + i;
+      foo (&arr[i], c); /* { dg-final { gdb-test 22 "i" "c - 48" } } */
+    }
+
+  __builtin_printf ("arr = %s\n", arr);
+  return 0;
+}
+
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index ddaa7d12f19..f43a564d786 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -637,6 +637,24 @@ thread_around_empty_block (edge taken_edge,
   if (!single_pred_p (bb))
     return NULL;
 
+  /* Before threading, copy DEBUG stmts from the predecessor, so that
+     we don't lose the bindings as we redirect the edges.  */
+  if (MAY_HAVE_DEBUG_STMTS)
+    {
+      gsi = gsi_after_labels (bb);
+      for (gimple_stmt_iterator si = gsi_last_bb (taken_edge->src);
+	   !gsi_end_p (si); gsi_prev (&si))
+	{
+	  stmt = gsi_stmt (si);
+	  if (!is_gimple_debug (stmt))
+	    continue;
+
+	  stmt = gimple_copy (stmt);
+	  /* ??? Should we drop the location of the copy?  */
+	  gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
+	}
+    }
+
   /* This block must have more than one successor.  */
   if (single_succ_p (bb))
     return NULL;