From 524d9a4532011e74366a8aa3549e4322ee2d75e2 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 3 Oct 2008 20:55:39 +0200
Subject: [PATCH] re PR debug/37726 (Even at -O0 -g debuginfo for vars
 mentioned in nested fns is not emitted)

	PR debug/37726
	* gimplify.c (declare_vars): Use gimple_bind_block instead of
	gimple_block.

	* gcc.dg/debug/dwarf2/pr37726.c: New test.

From-SVN: r140857
---
 gcc/ChangeLog                               |  6 +++++
 gcc/gimplify.c                              |  2 +-
 gcc/testsuite/ChangeLog                     |  5 +++++
 gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c | 25 +++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7084d185098..96499931370 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/37726
+	* gimplify.c (declare_vars): Use gimple_bind_block instead of
+	gimple_block.
+
 2008-10-03  Pascal Obry  <obry@adacore.com>
 
 	* gcov.c (create_file_names): Properly handle UNIX and DOS
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index d723d9f16a9..5123efdf321 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -772,7 +772,7 @@ declare_vars (tree vars, gimple scope, bool debug_info)
 
       temps = nreverse (last);
 
-      block = gimple_block (scope);
+      block = gimple_bind_block (scope);
       gcc_assert (!block || TREE_CODE (block) == BLOCK);
       if (!block || !debug_info)
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f2c8bf235d2..9078edc460b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/37726
+	* gcc.dg/debug/dwarf2/pr37726.c: New test.
+
 2008-10-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/37719
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c
new file mode 100644
index 00000000000..60fb8396169
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr37726.c
@@ -0,0 +1,25 @@
+/* PR debug/37726 */
+/* { dg-do compile } */
+/* { dg-options "-g -O0 -dA -fno-merge-debug-strings" } */
+
+int foo (int parm)
+{
+  int var = 0;
+  int bar (void)
+  {
+    return parm + var;
+  }
+  parm++;
+  var++;
+  return bar ();
+}
+
+int
+main (void)
+{
+  return foo (4) - 6;
+}
+
+/* Both parm and var variables should be in debug info for both foo and bar.  */
+/* { dg-final { scan-assembler-times "\"parm\[^\n\]*\"\[^\n\]*DW_AT_name" 2 } } */
+/* { dg-final { scan-assembler-times "\"var\[^\n\]*\"\[^\n\]*DW_AT_name" 2 } } */