Temporarily revert 2005-05-10 patch, which causes a 3.4 regression.

From-SVN: r99557

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 360fe4cc33223da9bacad445c247900fa19bf694..6be5a36b676f2e1442c016f52b7dbfaa99c6fc6c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-11  Ben Elliston  <bje@au.ibm.com>
+
+       * dwarf2out.c: Revert my 2005-05-10 patch.
+
 2005-05-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from mainline

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 7fae71bbd3505f56911b1e51214b1aa290259c6a..d59cc1d3ab57ae7c6df4a5302fcb62a18372ed6d 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12377,8 +12377,10 @@ dwarf2out_decl (tree decl)
       /* If we're a nested function, initially use a parent of NULL; if we're
         a plain function, this will be fixed up in decls_for_scope.  If
         we're a method, it will be ignored, since we already have a DIE.  */
-      if (decl_function_context (decl))
-         context_die = NULL;
+      if (decl_function_context (decl)
+         /* But if we're in terse mode, we don't care about scope.  */
+         && debug_info_level > DINFO_LEVEL_TERSE)
+       context_die = NULL;
       break;
 
     case VAR_DECL:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a92b89c083494c9787f2225f930c553f1ae95746..50d8ba796d9b411a909d949a68180385539eedbe 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-11  Ben Elliston  <bje@au.ibm.com>
+
+       * gcc.dg/debug/pr16676.c: Remove for now.
+
 2005-05-10  Ben Elliston  <bje@au.ibm.com>
 
        PR debug/16676

diff --git a/gcc/testsuite/gcc.dg/debug/pr16676.c b/gcc/testsuite/gcc.dg/debug/pr16676.c
deleted file mode 100644 (file)
index a975885..0000000
--- a/gcc/testsuite/gcc.dg/debug/pr16676.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* { dg-do compile } */
-
-void foo (void) { 
-  void nested () {} 
-}