* dwarf2read.c (die_needs_namespace): Also return 0 for

	DW_TAG_subprogram.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d9963d1463a900608222484fce88e621cc9c0a8..31745c6db78e2f364b87714c5636e83051aeb054 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2read.c (die_needs_namespace): Also return 0 for
+       DW_TAG_subprogram.
+
 2010-03-15  Sami Wagiaalla  <swagiaal@redhat.com>
 
        PR c++/7936:

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index db3f39614e9165871ad5cc97f3eb3f0bbfd84c92..563cb185de64e85d4092cd6057a90b26b8a08f30 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3241,7 +3241,8 @@ die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
         and have a mangled name.  */
       if (die->parent->tag ==  DW_TAG_lexical_block
          || die->parent->tag ==  DW_TAG_try_block
-         || die->parent->tag ==  DW_TAG_catch_block)
+         || die->parent->tag ==  DW_TAG_catch_block
+         || die->parent->tag == DW_TAG_subprogram)
        return 0;
       return 1;