2003-05-28 David Carlton <carlton@bactrian.org>

	* dwarf2read.c (determine_prefix): Handle anonymous
	classes/structures.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 840d98270e4bb89572f2c1d3435a78506cf148b8..004120452a2d555347a0c0366994e726733f3214 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-28  David Carlton  <carlton@bactrian.org>
+
+       * dwarf2read.c (determine_prefix): Handle anonymous
+       classes/structures.
+
 2003-05-23  David Carlton  <carlton@bactrian.org>
 
        * Makefile.in (cp-namespace.o): Depend on frame_h.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 71508fbc88e3a9c5e31d392503d04bf5055cca10..55d31d17adaf57a106f2b36126694b9cc631accc 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6030,9 +6030,18 @@ determine_prefix (struct die_info *die)
       case DW_TAG_class_type:
       case DW_TAG_structure_type:
        {
-
          if (parent_prefix != NULL)
-           return typename_concat (parent_prefix, dwarf2_name (parent));
+           {
+             const char *parent_name = dwarf2_name (parent);
+
+             if (parent_name != NULL)
+               return typename_concat (parent_prefix, dwarf2_name (parent));
+             else
+               /* FIXME: carlton/2003-05-28: I'm not sure what the
+                  best thing to do here is.  */
+               return typename_concat (parent_prefix,
+                                       "<<anonymous class>>");
+           }
          else
            return class_name (parent);
        }