btrace: reword error messages
[deliverable/binutils-gdb.git] / gdb / c-typeprint.c
index 22fdaa5beb7badbbeb6b2f5aa60005ab0ab89b24..2e9ed1bc28064ee3a2f62ce2149fe2c8f82a3be5 100644 (file)
@@ -1,5 +1,5 @@
 /* Support for printing C and C++ types for GDB, the GNU debugger.
-   Copyright (C) 1986-2017 Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
 #include "cp-abi.h"
 #include "cp-support.h"
 
+/* When printing the offsets of a struct and its fields (i.e., 'ptype
+   /o'; type_print_options::print_offsets), we use this many
+   characters when printing the offset information at the beginning of
+   the line.  This is needed in order to generate the correct amount
+   of whitespaces when no offset info should be printed for a certain
+   field.  */
+#define OFFSET_SPC_LEN 23
+
 /* A list of access specifiers used for printing.  */
 
 enum access_specifier
@@ -45,12 +53,18 @@ enum access_specifier
 static void c_type_print_varspec_prefix (struct type *,
                                         struct ui_file *,
                                         int, int, int,
-                                        const struct type_print_options *);
+                                        const struct type_print_options *,
+                                        struct print_offset_data *);
 
 /* Print "const", "volatile", or address space modifiers.  */
 static void c_type_print_modifier (struct type *,
                                   struct ui_file *,
                                   int, int);
+
+static void c_type_print_base_1 (struct type *type, struct ui_file *stream,
+                                int show, int level,
+                                const struct type_print_options *flags,
+                                struct print_offset_data *podata);
 \f
 
 /* A callback function for cp_canonicalize_string_full that uses
@@ -82,14 +96,15 @@ print_name_maybe_canonical (const char *name,
 
 \f
 
-/* LEVEL is the depth to indent lines by.  */
+/* Helper function for c_print_type.  */
 
-void
-c_print_type (struct type *type,
-             const char *varstring,
-             struct ui_file *stream,
-             int show, int level,
-             const struct type_print_options *flags)
+static void
+c_print_type_1 (struct type *type,
+               const char *varstring,
+               struct ui_file *stream,
+               int show, int level,
+               const struct type_print_options *flags,
+               struct print_offset_data *podata)
 {
   enum type_code code;
   int demangled_args;
@@ -108,7 +123,7 @@ c_print_type (struct type *type,
     }
   else
     {
-      c_type_print_base (type, stream, show, level, flags);
+      c_type_print_base_1 (type, stream, show, level, flags, podata);
       code = TYPE_CODE (type);
       if ((varstring != NULL && *varstring != '\0')
          /* Need a space if going to print stars or brackets;
@@ -124,7 +139,7 @@ c_print_type (struct type *type,
        fputs_filtered (" ", stream);
       need_post_space = (varstring != NULL && strcmp (varstring, "") != 0);
       c_type_print_varspec_prefix (type, stream, show, 0, need_post_space,
-                                  flags);
+                                  flags, podata);
     }
 
   if (varstring != NULL)
@@ -143,6 +158,20 @@ c_print_type (struct type *type,
     }
 }
 
+/* LEVEL is the depth to indent lines by.  */
+
+void
+c_print_type (struct type *type,
+             const char *varstring,
+             struct ui_file *stream,
+             int show, int level,
+             const struct type_print_options *flags)
+{
+  struct print_offset_data podata;
+
+  c_print_type_1 (type, varstring, stream, show, level, flags, &podata);
+}
+
 /* Print a typedef using C syntax.  TYPE is the underlying type.
    NEW_SYMBOL is the symbol naming the type.  STREAM is the stream on
    which to print.  */
@@ -310,7 +339,8 @@ c_type_print_varspec_prefix (struct type *type,
                             struct ui_file *stream,
                             int show, int passed_a_ptr,
                             int need_post_space,
-                            const struct type_print_options *flags)
+                            const struct type_print_options *flags,
+                            struct print_offset_data *podata)
 {
   const char *name;
 
@@ -326,40 +356,40 @@ c_type_print_varspec_prefix (struct type *type,
     {
     case TYPE_CODE_PTR:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 1, 1, flags);
+                                  stream, show, 1, 1, flags, podata);
       fprintf_filtered (stream, "*");
       c_type_print_modifier (type, stream, 1, need_post_space);
       break;
 
     case TYPE_CODE_MEMBERPTR:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 0, 0, flags);
+                                  stream, show, 0, 0, flags, podata);
       name = type_name_no_tag (TYPE_SELF_TYPE (type));
       if (name)
        print_name_maybe_canonical (name, flags, stream);
       else
-       c_type_print_base (TYPE_SELF_TYPE (type),
-                          stream, -1, passed_a_ptr, flags);
+       c_type_print_base_1 (TYPE_SELF_TYPE (type),
+                            stream, -1, passed_a_ptr, flags, podata);
       fprintf_filtered (stream, "::*");
       break;
 
     case TYPE_CODE_METHODPTR:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 0, 0, flags);
+                                  stream, show, 0, 0, flags, podata);
       fprintf_filtered (stream, "(");
       name = type_name_no_tag (TYPE_SELF_TYPE (type));
       if (name)
        print_name_maybe_canonical (name, flags, stream);
       else
-       c_type_print_base (TYPE_SELF_TYPE (type),
-                          stream, -1, passed_a_ptr, flags);
+       c_type_print_base_1 (TYPE_SELF_TYPE (type),
+                            stream, -1, passed_a_ptr, flags, podata);
       fprintf_filtered (stream, "::*");
       break;
 
     case TYPE_CODE_REF:
     case TYPE_CODE_RVALUE_REF:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 1, 0, flags);
+                                  stream, show, 1, 0, flags, podata);
       fprintf_filtered (stream, TYPE_CODE(type) == TYPE_CODE_REF ? "&" : "&&");
       c_type_print_modifier (type, stream, 1, need_post_space);
       break;
@@ -367,21 +397,22 @@ c_type_print_varspec_prefix (struct type *type,
     case TYPE_CODE_METHOD:
     case TYPE_CODE_FUNC:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 0, 0, flags);
+                                  stream, show, 0, 0, flags, podata);
       if (passed_a_ptr)
        fprintf_filtered (stream, "(");
       break;
 
     case TYPE_CODE_ARRAY:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, 0, 0, flags);
+                                  stream, show, 0, 0, flags, podata);
       if (passed_a_ptr)
        fprintf_filtered (stream, "(");
       break;
 
     case TYPE_CODE_TYPEDEF:
       c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
-                                  stream, show, passed_a_ptr, 0, flags);
+                                  stream, show, passed_a_ptr, 0, flags,
+                                  podata);
       break;
 
     case TYPE_CODE_UNDEF:
@@ -836,21 +867,36 @@ c_type_print_template_args (const struct type_print_options *flags,
     fputs_filtered (_("] "), stream);
 }
 
+/* Use 'print_spaces_filtered', but take into consideration the
+   type_print_options FLAGS in order to determine how many whitespaces
+   will be printed.  */
+
+static void
+print_spaces_filtered_with_print_options
+  (int level, struct ui_file *stream, const struct type_print_options *flags)
+{
+  if (!flags->print_offsets)
+    print_spaces_filtered (level, stream);
+  else
+    print_spaces_filtered (level + OFFSET_SPC_LEN, stream);
+}
+
 /* Output an access specifier to STREAM, if needed.  LAST_ACCESS is the
    last access specifier output (typically returned by this function).  */
 
 static enum access_specifier
 output_access_specifier (struct ui_file *stream,
                         enum access_specifier last_access,
-                        int level, bool is_protected, bool is_private)
+                        int level, bool is_protected, bool is_private,
+                        const struct type_print_options *flags)
 {
   if (is_protected)
     {
       if (last_access != s_protected)
        {
          last_access = s_protected;
-         fprintfi_filtered (level + 2, stream,
-                            "protected:\n");
+         print_spaces_filtered_with_print_options (level + 2, stream, flags);
+         fprintf_filtered (stream, "protected:\n");
        }
     }
   else if (is_private)
@@ -858,8 +904,8 @@ output_access_specifier (struct ui_file *stream,
       if (last_access != s_private)
        {
          last_access = s_private;
-         fprintfi_filtered (level + 2, stream,
-                            "private:\n");
+         print_spaces_filtered_with_print_options (level + 2, stream, flags);
+         fprintf_filtered (stream, "private:\n");
        }
     }
   else
@@ -867,14 +913,615 @@ output_access_specifier (struct ui_file *stream,
       if (last_access != s_public)
        {
          last_access = s_public;
-         fprintfi_filtered (level + 2, stream,
-                            "public:\n");
+         print_spaces_filtered_with_print_options (level + 2, stream, flags);
+         fprintf_filtered (stream, "public:\n");
        }
     }
 
   return last_access;
 }
 
+/* Print information about field at index FIELD_IDX of the union type
+   TYPE.  Since union fields don't have the concept of offsets, we
+   just print their sizes.
+
+   The output is strongly based on pahole(1).  */
+
+static void
+c_print_type_union_field_offset (struct type *type, unsigned int field_idx,
+                                struct ui_file *stream)
+{
+  struct type *ftype = check_typedef (TYPE_FIELD_TYPE (type, field_idx));
+
+  fprintf_filtered (stream, "/*              %4u */", TYPE_LENGTH (ftype));
+}
+
+/* Print information about field at index FIELD_IDX of the struct type
+   TYPE.
+
+   PODATA->END_BITPOS is the one-past-the-end bit position of the
+   previous field (where we expect this field to be if there is no
+   hole).  At the end, ENDPOS is updated to the one-past-the-end bit
+   position of the current field.
+
+   PODATA->OFFSET_BITPOS is the offset value we carry over when we are
+   printing a struct that is inside another struct; this is useful so
+   that the offset is constantly incremented (if we didn't carry it
+   over, the offset would be reset to zero when printing the inner
+   struct).
+
+   The output is strongly based on pahole(1).  */
+
+static void
+c_print_type_struct_field_offset (struct type *type, unsigned int field_idx,
+                                 struct ui_file *stream,
+                                 struct print_offset_data *podata)
+{
+  struct type *ftype = check_typedef (TYPE_FIELD_TYPE (type, field_idx));
+  unsigned int bitpos = TYPE_FIELD_BITPOS (type, field_idx);
+  unsigned int fieldsize_byte = TYPE_LENGTH (ftype);
+  unsigned int fieldsize_bit = fieldsize_byte * TARGET_CHAR_BIT;
+
+  /* We check for PODATA->END_BITPOS > 0 because there is a specific
+     scenario when PODATA->END_BITPOS can be zero and BITPOS can be >
+     0: when we are dealing with a struct/class with a virtual method.
+     Because of the vtable, the first field of the struct/class will
+     have an offset of sizeof (void *) (the size of the vtable).  If
+     we do not check for PODATA->END_BITPOS > 0 here, GDB will report
+     a hole before the first field, which is not accurate.  */
+  if (podata->end_bitpos > 0 && podata->end_bitpos < bitpos)
+    {
+      /* If PODATA->END_BITPOS is smaller than the current type's
+        bitpos, it means there's a hole in the struct, so we report
+        it here.  */
+      unsigned int hole = bitpos - podata->end_bitpos;
+      unsigned int hole_byte = hole / TARGET_CHAR_BIT;
+      unsigned int hole_bit = hole % TARGET_CHAR_BIT;
+
+      if (hole_bit > 0)
+       fprintf_filtered (stream, "/* XXX %2u-bit hole   */\n", hole_bit);
+
+      if (hole_byte > 0)
+       fprintf_filtered (stream, "/* XXX %2u-byte hole  */\n", hole_byte);
+    }
+
+  if (TYPE_FIELD_PACKED (type, field_idx))
+    {
+      /* We're dealing with a bitfield.  Print how many bits are left
+        to be used.  */
+      unsigned int bitsize = TYPE_FIELD_BITSIZE (type, field_idx);
+      /* The bitpos relative to the beginning of our container
+        field.  */
+      unsigned int relative_bitpos;
+
+      /* The following was copied from
+        value.c:value_primitive_field.  */
+      if ((bitpos % fieldsize_bit) + bitsize <= fieldsize_bit)
+       relative_bitpos = bitpos % fieldsize_bit;
+      else
+       relative_bitpos = bitpos % TARGET_CHAR_BIT;
+
+      /* This is the exact offset (in bits) of this bitfield.  */
+      unsigned int bit_offset
+       = (bitpos - relative_bitpos) + podata->offset_bitpos;
+
+      /* The position of the field, relative to the beginning of the
+        struct, and how many bits are left to be used in this
+        container.  */
+      fprintf_filtered (stream, "/* %4u:%2u", bit_offset / TARGET_CHAR_BIT,
+                       fieldsize_bit - (relative_bitpos + bitsize));
+      fieldsize_bit = bitsize;
+    }
+  else
+    {
+      /* The position of the field, relative to the beginning of the
+        struct.  */
+      fprintf_filtered (stream, "/* %4u",
+                       (bitpos + podata->offset_bitpos) / TARGET_CHAR_BIT);
+
+      fprintf_filtered (stream, "   ");
+    }
+
+  fprintf_filtered (stream, "   |  %4u */", fieldsize_byte);
+
+  podata->end_bitpos = bitpos + fieldsize_bit;
+}
+
+/* Return true if an access label (i.e., "public:", "private:",
+   "protected:") needs to be printed for TYPE.  */
+
+static bool
+need_access_label_p (struct type *type)
+{
+  if (TYPE_DECLARED_CLASS (type))
+    {
+      QUIT;
+      for (int i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
+       if (!TYPE_FIELD_PRIVATE (type, i))
+         return true;
+      QUIT;
+      for (int j = 0; j < TYPE_NFN_FIELDS (type); j++)
+       for (int i = 0; i < TYPE_FN_FIELDLIST_LENGTH (type, j); i++)
+         if (!TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
+                                                         j), i))
+           return true;
+      QUIT;
+      for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
+       if (!TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
+         return true;
+    }
+  else
+    {
+      QUIT;
+      for (int i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
+       if (TYPE_FIELD_PRIVATE (type, i) || TYPE_FIELD_PROTECTED (type, i))
+         return true;
+      QUIT;
+      for (int j = 0; j < TYPE_NFN_FIELDS (type); j++)
+       {
+         QUIT;
+         for (int i = 0; i < TYPE_FN_FIELDLIST_LENGTH (type, j); i++)
+           if (TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type,
+                                                            j), i)
+               || TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
+                                                             j),
+                                         i))
+             return true;
+       }
+      QUIT;
+      for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
+       if (TYPE_TYPEDEF_FIELD_PROTECTED (type, i)
+           || TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
+         return true;
+    }
+
+  return false;
+}
+
+/* Helper function that temporarily disables FLAGS->PRINT_OFFSETS,
+   calls 'c_print_type_1', and then reenables FLAGS->PRINT_OFFSETS if
+   applicable.  */
+
+static void
+c_print_type_no_offsets (struct type *type,
+                        const char *varstring,
+                        struct ui_file *stream,
+                        int show, int level,
+                        struct type_print_options *flags,
+                        struct print_offset_data *podata)
+{
+  unsigned int old_po = flags->print_offsets;
+
+  /* Temporarily disable print_offsets, because it would mess with
+     indentation.  */
+  flags->print_offsets = 0;
+  c_print_type_1 (type, varstring, stream, show, level, flags, podata);
+  flags->print_offsets = old_po;
+}
+
+/* Helper for 'c_type_print_base' that handles structs and unions.
+   For a description of the arguments, see 'c_type_print_base'.  */
+
+static void
+c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
+                               int show, int level,
+                               const struct type_print_options *flags,
+                               struct print_offset_data *podata)
+{
+  struct type_print_options local_flags = *flags;
+  struct type_print_options semi_local_flags = *flags;
+  struct cleanup *local_cleanups = make_cleanup (null_cleanup, NULL);
+
+  local_flags.local_typedefs = NULL;
+  semi_local_flags.local_typedefs = NULL;
+
+  if (!flags->raw)
+    {
+      if (flags->local_typedefs)
+       local_flags.local_typedefs
+         = copy_typedef_hash (flags->local_typedefs);
+      else
+       local_flags.local_typedefs = create_typedef_hash ();
+
+      make_cleanup_free_typedef_hash (local_flags.local_typedefs);
+    }
+
+  c_type_print_modifier (type, stream, 0, 1);
+  if (TYPE_CODE (type) == TYPE_CODE_UNION)
+    fprintf_filtered (stream, "union ");
+  else if (TYPE_DECLARED_CLASS (type))
+    fprintf_filtered (stream, "class ");
+  else
+    fprintf_filtered (stream, "struct ");
+
+  /* Print the tag if it exists.  The HP aCC compiler emits a
+     spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed
+     enum}" tag for unnamed struct/union/enum's, which we don't
+     want to print.  */
+  if (TYPE_TAG_NAME (type) != NULL
+      && !startswith (TYPE_TAG_NAME (type), "{unnamed"))
+    {
+      /* When printing the tag name, we are still effectively
+        printing in the outer context, hence the use of FLAGS
+        here.  */
+      print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream);
+      if (show > 0)
+       fputs_filtered (" ", stream);
+    }
+
+  if (show < 0)
+    {
+      /* If we just printed a tag name, no need to print anything
+        else.  */
+      if (TYPE_TAG_NAME (type) == NULL)
+       fprintf_filtered (stream, "{...}");
+    }
+  else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+    {
+      struct type *basetype;
+      int vptr_fieldno;
+
+      c_type_print_template_args (&local_flags, type, stream);
+
+      /* Add in template parameters when printing derivation info.  */
+      add_template_parameters (local_flags.local_typedefs, type);
+      cp_type_print_derivation_info (stream, type, &local_flags);
+
+      /* This holds just the global typedefs and the template
+        parameters.  */
+      semi_local_flags.local_typedefs
+       = copy_typedef_hash (local_flags.local_typedefs);
+      if (semi_local_flags.local_typedefs)
+       make_cleanup_free_typedef_hash (semi_local_flags.local_typedefs);
+
+      /* Now add in the local typedefs.  */
+      recursively_update_typedef_hash (local_flags.local_typedefs, type);
+
+      fprintf_filtered (stream, "{\n");
+
+      if (TYPE_NFIELDS (type) == 0 && TYPE_NFN_FIELDS (type) == 0
+         && TYPE_TYPEDEF_FIELD_COUNT (type) == 0)
+       {
+         if (TYPE_STUB (type))
+           fprintfi_filtered (level + 4, stream,
+                              _("<incomplete type>\n"));
+         else
+           fprintfi_filtered (level + 4, stream,
+                              _("<no data fields>\n"));
+       }
+
+      /* Start off with no specific section type, so we can print
+        one for the first field we find, and use that section type
+        thereafter until we find another type.  */
+
+      enum access_specifier section_type = s_none;
+
+      /* For a class, if all members are private, there's no need
+        for a "private:" label; similarly, for a struct or union
+        masquerading as a class, if all members are public, there's
+        no need for a "public:" label.  */
+      bool need_access_label = need_access_label_p (type);
+
+      /* If there is a base class for this type,
+        do not print the field that it occupies.  */
+
+      int len = TYPE_NFIELDS (type);
+      vptr_fieldno = get_vptr_fieldno (type, &basetype);
+
+      struct print_offset_data local_podata;
+
+      for (int i = TYPE_N_BASECLASSES (type); i < len; i++)
+       {
+         QUIT;
+
+         /* If we have a virtual table pointer, omit it.  Even if
+            virtual table pointers are not specifically marked in
+            the debug info, they should be artificial.  */
+         if ((i == vptr_fieldno && type == basetype)
+             || TYPE_FIELD_ARTIFICIAL (type, i))
+           continue;
+
+         if (need_access_label)
+           {
+             section_type = output_access_specifier
+               (stream, section_type, level,
+                TYPE_FIELD_PROTECTED (type, i),
+                TYPE_FIELD_PRIVATE (type, i), flags);
+           }
+
+         bool is_static = field_is_static (&TYPE_FIELD (type, i));
+
+         if (flags->print_offsets)
+           {
+             if (!is_static)
+               {
+                 if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+                   {
+                     c_print_type_struct_field_offset
+                       (type, i, stream, podata);
+                   }
+                 else if (TYPE_CODE (type) == TYPE_CODE_UNION)
+                   c_print_type_union_field_offset (type, i, stream);
+               }
+             else
+               print_spaces_filtered (OFFSET_SPC_LEN, stream);
+           }
+
+         print_spaces_filtered (level + 4, stream);
+         if (is_static)
+           fprintf_filtered (stream, "static ");
+
+         int newshow = show - 1;
+
+         if (flags->print_offsets
+             && (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_STRUCT
+                 || TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_UNION))
+           {
+             /* If we're printing offsets and this field's type is
+                either a struct or an union, then we're interested in
+                expanding it.  */
+             ++newshow;
+
+             /* Make sure we carry our offset when we expand the
+                struct/union.  */
+             local_podata.offset_bitpos
+               = podata->offset_bitpos + TYPE_FIELD_BITPOS (type, i);
+             /* We're entering a struct/union.  Right now,
+                PODATA->END_BITPOS points right *after* the
+                struct/union.  However, when printing the first field
+                of this inner struct/union, the end_bitpos we're
+                expecting is exactly at the beginning of the
+                struct/union.  Therefore, we subtract the length of
+                the whole struct/union.  */
+             local_podata.end_bitpos
+               = podata->end_bitpos
+                 - TYPE_LENGTH (TYPE_FIELD_TYPE (type, i)) * TARGET_CHAR_BIT;
+           }
+
+         c_print_type_1 (TYPE_FIELD_TYPE (type, i),
+                         TYPE_FIELD_NAME (type, i),
+                         stream, newshow, level + 4,
+                         &local_flags, &local_podata);
+
+         if (!is_static && TYPE_FIELD_PACKED (type, i))
+           {
+             /* It is a bitfield.  This code does not attempt
+                to look at the bitpos and reconstruct filler,
+                unnamed fields.  This would lead to misleading
+                results if the compiler does not put out fields
+                for such things (I don't know what it does).  */
+             fprintf_filtered (stream, " : %d",
+                               TYPE_FIELD_BITSIZE (type, i));
+           }
+         fprintf_filtered (stream, ";\n");
+       }
+
+      /* If there are both fields and methods, put a blank line
+        between them.  Make sure to count only method that we
+        will display; artificial methods will be hidden.  */
+      len = TYPE_NFN_FIELDS (type);
+      if (!flags->print_methods)
+       len = 0;
+      int real_len = 0;
+      for (int i = 0; i < len; i++)
+       {
+         struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
+         int len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
+         int j;
+
+         for (j = 0; j < len2; j++)
+           if (!TYPE_FN_FIELD_ARTIFICIAL (f, j))
+             real_len++;
+       }
+      if (real_len > 0 && section_type != s_none)
+       fprintf_filtered (stream, "\n");
+
+      /* C++: print out the methods.  */
+      for (int i = 0; i < len; i++)
+       {
+         struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
+         int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
+         const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
+         const char *name = type_name_no_tag (type);
+         int is_constructor = name && strcmp (method_name,
+                                              name) == 0;
+
+         for (j = 0; j < len2; j++)
+           {
+             const char *mangled_name;
+             gdb::unique_xmalloc_ptr<char> mangled_name_holder;
+             char *demangled_name;
+             const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+             int is_full_physname_constructor =
+               TYPE_FN_FIELD_CONSTRUCTOR (f, j)
+               || is_constructor_name (physname)
+               || is_destructor_name (physname)
+               || method_name[0] == '~';
+
+             /* Do not print out artificial methods.  */
+             if (TYPE_FN_FIELD_ARTIFICIAL (f, j))
+               continue;
+
+             QUIT;
+             section_type = output_access_specifier
+               (stream, section_type, level,
+                TYPE_FN_FIELD_PROTECTED (f, j),
+                TYPE_FN_FIELD_PRIVATE (f, j), flags);
+
+             print_spaces_filtered_with_print_options (level + 4, stream,
+                                                       flags);
+             if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
+               fprintf_filtered (stream, "virtual ");
+             else if (TYPE_FN_FIELD_STATIC_P (f, j))
+               fprintf_filtered (stream, "static ");
+             if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
+               {
+                 /* Keep GDB from crashing here.  */
+                 fprintf_filtered (stream,
+                                   _("<undefined type> %s;\n"),
+                                   TYPE_FN_FIELD_PHYSNAME (f, j));
+                 break;
+               }
+             else if (!is_constructor  /* Constructors don't
+                                          have declared
+                                          types.  */
+                      && !is_full_physname_constructor  /* " " */
+                      && !is_type_conversion_operator (type, i, j))
+               {
+                 c_print_type_no_offsets
+                   (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
+                    "", stream, -1, 0, &local_flags, podata);
+
+                 fputs_filtered (" ", stream);
+               }
+             if (TYPE_FN_FIELD_STUB (f, j))
+               {
+                 /* Build something we can demangle.  */
+                 mangled_name_holder.reset (gdb_mangle_name (type, i, j));
+                 mangled_name = mangled_name_holder.get ();
+               }
+             else
+               mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
+
+             demangled_name =
+               gdb_demangle (mangled_name,
+                             DMGL_ANSI | DMGL_PARAMS);
+             if (demangled_name == NULL)
+               {
+                 /* In some cases (for instance with the HP
+                    demangling), if a function has more than 10
+                    arguments, the demangling will fail.
+                    Let's try to reconstruct the function
+                    signature from the symbol information.  */
+                 if (!TYPE_FN_FIELD_STUB (f, j))
+                   {
+                     int staticp = TYPE_FN_FIELD_STATIC_P (f, j);
+                     struct type *mtype = TYPE_FN_FIELD_TYPE (f, j);
+
+                     cp_type_print_method_args (mtype,
+                                                "",
+                                                method_name,
+                                                staticp,
+                                                stream, &local_flags);
+                   }
+                 else
+                   fprintf_filtered (stream,
+                                     _("<badly mangled name '%s'>"),
+                                     mangled_name);
+               }
+             else
+               {
+                 char *p;
+                 char *demangled_no_class
+                   = remove_qualifiers (demangled_name);
+
+                 /* Get rid of the `static' appended by the
+                    demangler.  */
+                 p = strstr (demangled_no_class, " static");
+                 if (p != NULL)
+                   {
+                     int length = p - demangled_no_class;
+                     char *demangled_no_static;
+
+                     demangled_no_static
+                       = (char *) xmalloc (length + 1);
+                     strncpy (demangled_no_static,
+                              demangled_no_class, length);
+                     *(demangled_no_static + length) = '\0';
+                     fputs_filtered (demangled_no_static, stream);
+                     xfree (demangled_no_static);
+                   }
+                 else
+                   fputs_filtered (demangled_no_class, stream);
+                 xfree (demangled_name);
+               }
+
+             fprintf_filtered (stream, ";\n");
+           }
+       }
+
+      /* Print out nested types.  */
+      if (TYPE_NESTED_TYPES_COUNT (type) != 0
+         && semi_local_flags.print_nested_type_limit != 0)
+       {
+         if (semi_local_flags.print_nested_type_limit > 0)
+           --semi_local_flags.print_nested_type_limit;
+
+         if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
+           fprintf_filtered (stream, "\n");
+
+         for (int i = 0; i < TYPE_NESTED_TYPES_COUNT (type); ++i)
+           {
+             print_spaces_filtered_with_print_options (level + 4, stream,
+                                                       flags);
+             c_print_type_no_offsets (TYPE_NESTED_TYPES_FIELD_TYPE (type, i),
+                                      "", stream, show, level + 4,
+                                      &semi_local_flags, podata);
+             fprintf_filtered (stream, ";\n");
+           }
+       }
+
+      /* Print typedefs defined in this class.  */
+
+      if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
+       {
+         if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0
+             || TYPE_NESTED_TYPES_COUNT (type) != 0)
+           fprintf_filtered (stream, "\n");
+
+         for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
+           {
+             struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
+
+             /* Dereference the typedef declaration itself.  */
+             gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
+             target = TYPE_TARGET_TYPE (target);
+
+             if (need_access_label)
+               {
+                 section_type = output_access_specifier
+                   (stream, section_type, level,
+                    TYPE_TYPEDEF_FIELD_PROTECTED (type, i),
+                    TYPE_TYPEDEF_FIELD_PRIVATE (type, i), flags);
+               }
+             print_spaces_filtered_with_print_options (level + 4, stream,
+                                                       flags);
+             fprintf_filtered (stream, "typedef ");
+
+             /* We want to print typedefs with substitutions
+                from the template parameters or globally-known
+                typedefs but not local typedefs.  */
+             c_print_type_no_offsets (target,
+                                      TYPE_TYPEDEF_FIELD_NAME (type, i),
+                                      stream, show - 1, level + 4,
+                                      &semi_local_flags, podata);
+             fprintf_filtered (stream, ";\n");
+           }
+       }
+
+      if (flags->print_offsets)
+       {
+         if (show > 0)
+           {
+             fputs_filtered ("\n", stream);
+             print_spaces_filtered_with_print_options (level + 4,
+                                                       stream,
+                                                       flags);
+             fprintf_filtered (stream, "/* total size (bytes): %4u */\n",
+                               TYPE_LENGTH (type));
+           }
+
+         print_spaces_filtered (OFFSET_SPC_LEN, stream);
+         if (level == 0)
+           print_spaces_filtered (2, stream);
+       }
+
+      fprintfi_filtered (level, stream, "}");
+    }
+
+  do_cleanups (local_cleanups);
+}
+
 /* Print the name of the type (or the ultimate pointer target,
    function value or array element), or the description of a structure
    or union.
@@ -893,15 +1540,14 @@ output_access_specifier (struct ui_file *stream,
    LEVEL is the number of spaces to indent by.
    We increase it for some recursive calls.  */
 
-void
-c_type_print_base (struct type *type, struct ui_file *stream,
-                  int show, int level, const struct type_print_options *flags)
+static void
+c_type_print_base_1 (struct type *type, struct ui_file *stream,
+                    int show, int level,
+                    const struct type_print_options *flags,
+                    struct print_offset_data *podata)
 {
   int i;
-  int len, real_len;
-  enum access_specifier section_type;
-  int need_access_label = 0;
-  int j, len2;
+  int len;
 
   QUIT;
 
@@ -943,8 +1589,8 @@ c_type_print_base (struct type *type, struct ui_file *stream,
       if (TYPE_TARGET_TYPE (type) == NULL)
        type_print_unknown_return_type (stream);
       else
-       c_type_print_base (TYPE_TARGET_TYPE (type),
-                          stream, show, level, flags);
+       c_type_print_base_1 (TYPE_TARGET_TYPE (type),
+                            stream, show, level, flags, podata);
       break;
     case TYPE_CODE_ARRAY:
     case TYPE_CODE_PTR:
@@ -952,429 +1598,14 @@ c_type_print_base (struct type *type, struct ui_file *stream,
     case TYPE_CODE_REF:
     case TYPE_CODE_RVALUE_REF:
     case TYPE_CODE_METHODPTR:
-      c_type_print_base (TYPE_TARGET_TYPE (type),
-                        stream, show, level, flags);
+      c_type_print_base_1 (TYPE_TARGET_TYPE (type),
+                          stream, show, level, flags, podata);
       break;
 
     case TYPE_CODE_STRUCT:
     case TYPE_CODE_UNION:
-      {
-       struct type_print_options local_flags = *flags;
-       struct type_print_options semi_local_flags = *flags;
-       struct cleanup *local_cleanups = make_cleanup (null_cleanup, NULL);
-
-       local_flags.local_typedefs = NULL;
-       semi_local_flags.local_typedefs = NULL;
-
-       if (!flags->raw)
-         {
-           if (flags->local_typedefs)
-             local_flags.local_typedefs
-               = copy_typedef_hash (flags->local_typedefs);
-           else
-             local_flags.local_typedefs = create_typedef_hash ();
-
-           make_cleanup_free_typedef_hash (local_flags.local_typedefs);
-         }
-
-       c_type_print_modifier (type, stream, 0, 1);
-       if (TYPE_CODE (type) == TYPE_CODE_UNION)
-         fprintf_filtered (stream, "union ");
-       else if (TYPE_DECLARED_CLASS (type))
-         fprintf_filtered (stream, "class ");
-       else
-         fprintf_filtered (stream, "struct ");
-
-       /* Print the tag if it exists.  The HP aCC compiler emits a
-          spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed
-          enum}" tag for unnamed struct/union/enum's, which we don't
-          want to print.  */
-       if (TYPE_TAG_NAME (type) != NULL
-           && !startswith (TYPE_TAG_NAME (type), "{unnamed"))
-         {
-           /* When printing the tag name, we are still effectively
-              printing in the outer context, hence the use of FLAGS
-              here.  */
-           print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream);
-           if (show > 0)
-             fputs_filtered (" ", stream);
-         }
-
-       if (show < 0)
-         {
-           /* If we just printed a tag name, no need to print anything
-              else.  */
-           if (TYPE_TAG_NAME (type) == NULL)
-             fprintf_filtered (stream, "{...}");
-         }
-       else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
-         {
-           struct type *basetype;
-           int vptr_fieldno;
-
-           c_type_print_template_args (&local_flags, type, stream);
-
-           /* Add in template parameters when printing derivation info.  */
-           add_template_parameters (local_flags.local_typedefs, type);
-           cp_type_print_derivation_info (stream, type, &local_flags);
-
-           /* This holds just the global typedefs and the template
-              parameters.  */
-           semi_local_flags.local_typedefs
-             = copy_typedef_hash (local_flags.local_typedefs);
-           if (semi_local_flags.local_typedefs)
-             make_cleanup_free_typedef_hash (semi_local_flags.local_typedefs);
-
-           /* Now add in the local typedefs.  */
-           recursively_update_typedef_hash (local_flags.local_typedefs, type);
-
-           fprintf_filtered (stream, "{\n");
-           if (TYPE_NFIELDS (type) == 0 && TYPE_NFN_FIELDS (type) == 0
-               && TYPE_TYPEDEF_FIELD_COUNT (type) == 0)
-             {
-               if (TYPE_STUB (type))
-                 fprintfi_filtered (level + 4, stream,
-                                    _("<incomplete type>\n"));
-               else
-                 fprintfi_filtered (level + 4, stream,
-                                    _("<no data fields>\n"));
-             }
-
-           /* Start off with no specific section type, so we can print
-              one for the first field we find, and use that section type
-              thereafter until we find another type.  */
-
-           section_type = s_none;
-
-           /* For a class, if all members are private, there's no need
-              for a "private:" label; similarly, for a struct or union
-              masquerading as a class, if all members are public, there's
-              no need for a "public:" label.  */
-
-           if (TYPE_DECLARED_CLASS (type))
-             {
-               QUIT;
-               len = TYPE_NFIELDS (type);
-               for (i = TYPE_N_BASECLASSES (type); i < len; i++)
-                 if (!TYPE_FIELD_PRIVATE (type, i))
-                   {
-                     need_access_label = 1;
-                     break;
-                   }
-               QUIT;
-               if (!need_access_label)
-                 {
-                   len2 = TYPE_NFN_FIELDS (type);
-                   for (j = 0; j < len2; j++)
-                     {
-                       len = TYPE_FN_FIELDLIST_LENGTH (type, j);
-                       for (i = 0; i < len; i++)
-                         if (!TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
-                                                                         j), i))
-                           {
-                             need_access_label = 1;
-                             break;
-                           }
-                       if (need_access_label)
-                         break;
-                     }
-                 }
-               QUIT;
-               if (!need_access_label)
-                 {
-                   for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
-                     {
-                       if (!TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
-                         {
-                           need_access_label = 1;
-                           break;
-                         }
-                     }
-                 }
-             }
-           else
-             {
-               QUIT;
-               len = TYPE_NFIELDS (type);
-               for (i = TYPE_N_BASECLASSES (type); i < len; i++)
-                 if (TYPE_FIELD_PRIVATE (type, i)
-                     || TYPE_FIELD_PROTECTED (type, i))
-                   {
-                     need_access_label = 1;
-                     break;
-                   }
-               QUIT;
-               if (!need_access_label)
-                 {
-                   len2 = TYPE_NFN_FIELDS (type);
-                   for (j = 0; j < len2; j++)
-                     {
-                       QUIT;
-                       len = TYPE_FN_FIELDLIST_LENGTH (type, j);
-                       for (i = 0; i < len; i++)
-                         if (TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type,
-                                                                          j), i)
-                             || TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
-                                                                           j),
-                                                       i))
-                           {
-                             need_access_label = 1;
-                             break;
-                           }
-                       if (need_access_label)
-                         break;
-                     }
-                 }
-               QUIT;
-               if (!need_access_label)
-                 {
-                   for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
-                     {
-                       if (TYPE_TYPEDEF_FIELD_PROTECTED (type, i)
-                           || TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
-                         {
-                           need_access_label = 1;
-                           break;
-                         }
-                     }
-                 }
-             }
-
-           /* If there is a base class for this type,
-              do not print the field that it occupies.  */
-
-           len = TYPE_NFIELDS (type);
-           vptr_fieldno = get_vptr_fieldno (type, &basetype);
-           for (i = TYPE_N_BASECLASSES (type); i < len; i++)
-             {
-               QUIT;
-
-               /* If we have a virtual table pointer, omit it.  Even if
-                  virtual table pointers are not specifically marked in
-                  the debug info, they should be artificial.  */
-               if ((i == vptr_fieldno && type == basetype)
-                   || TYPE_FIELD_ARTIFICIAL (type, i))
-                 continue;
-
-               if (need_access_label)
-                 {
-                   section_type = output_access_specifier
-                     (stream, section_type, level,
-                      TYPE_FIELD_PROTECTED (type, i),
-                      TYPE_FIELD_PRIVATE (type, i));
-                 }
-
-               print_spaces_filtered (level + 4, stream);
-               if (field_is_static (&TYPE_FIELD (type, i)))
-                 fprintf_filtered (stream, "static ");
-               c_print_type (TYPE_FIELD_TYPE (type, i),
-                             TYPE_FIELD_NAME (type, i),
-                             stream, show - 1, level + 4,
-                             &local_flags);
-               if (!field_is_static (&TYPE_FIELD (type, i))
-                   && TYPE_FIELD_PACKED (type, i))
-                 {
-                   /* It is a bitfield.  This code does not attempt
-                      to look at the bitpos and reconstruct filler,
-                      unnamed fields.  This would lead to misleading
-                      results if the compiler does not put out fields
-                      for such things (I don't know what it does).  */
-                   fprintf_filtered (stream, " : %d",
-                                     TYPE_FIELD_BITSIZE (type, i));
-                 }
-               fprintf_filtered (stream, ";\n");
-             }
-
-         /* If there are both fields and methods, put a blank line
-            between them.  Make sure to count only method that we
-            will display; artificial methods will be hidden.  */
-         len = TYPE_NFN_FIELDS (type);
-         if (!flags->print_methods)
-           len = 0;
-         real_len = 0;
-         for (i = 0; i < len; i++)
-           {
-             struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
-             int len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
-             int j;
-
-             for (j = 0; j < len2; j++)
-               if (!TYPE_FN_FIELD_ARTIFICIAL (f, j))
-                 real_len++;
-           }
-         if (real_len > 0 && section_type != s_none)
-           fprintf_filtered (stream, "\n");
-
-         /* C++: print out the methods.  */
-         for (i = 0; i < len; i++)
-           {
-             struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
-             int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
-             const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
-             const char *name = type_name_no_tag (type);
-             int is_constructor = name && strcmp (method_name,
-                                                  name) == 0;
-
-             for (j = 0; j < len2; j++)
-               {
-                 const char *mangled_name;
-                 char *demangled_name;
-                 struct cleanup *inner_cleanup;
-                 const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
-                 int is_full_physname_constructor =
-                   TYPE_FN_FIELD_CONSTRUCTOR (f, j)
-                   || is_constructor_name (physname)
-                   || is_destructor_name (physname)
-                   || method_name[0] == '~';
-
-                 /* Do not print out artificial methods.  */
-                 if (TYPE_FN_FIELD_ARTIFICIAL (f, j))
-                   continue;
-
-                 inner_cleanup = make_cleanup (null_cleanup, NULL);
-
-                 QUIT;
-                 section_type = output_access_specifier
-                   (stream, section_type, level,
-                    TYPE_FN_FIELD_PROTECTED (f, j),
-                    TYPE_FN_FIELD_PRIVATE (f, j));
-
-                 print_spaces_filtered (level + 4, stream);
-                 if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
-                   fprintf_filtered (stream, "virtual ");
-                 else if (TYPE_FN_FIELD_STATIC_P (f, j))
-                   fprintf_filtered (stream, "static ");
-                 if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
-                   {
-                     /* Keep GDB from crashing here.  */
-                     fprintf_filtered (stream,
-                                       _("<undefined type> %s;\n"),
-                                       TYPE_FN_FIELD_PHYSNAME (f, j));
-                     break;
-                   }
-                 else if (!is_constructor      /* Constructors don't
-                                                  have declared
-                                                  types.  */
-                          && !is_full_physname_constructor  /* " " */
-                          && !is_type_conversion_operator (type, i, j))
-                   {
-                     c_print_type (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
-                                   "", stream, -1, 0,
-                                   &local_flags);
-                     fputs_filtered (" ", stream);
-                   }
-                 if (TYPE_FN_FIELD_STUB (f, j))
-                   {
-                     char *tem;
-
-                     /* Build something we can demangle.  */
-                     tem = gdb_mangle_name (type, i, j);
-                     make_cleanup (xfree, tem);
-                     mangled_name = tem;
-                   }
-                 else
-                   mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
-
-                 demangled_name =
-                   gdb_demangle (mangled_name,
-                                 DMGL_ANSI | DMGL_PARAMS);
-                 if (demangled_name == NULL)
-                   {
-                     /* In some cases (for instance with the HP
-                        demangling), if a function has more than 10
-                        arguments, the demangling will fail.
-                        Let's try to reconstruct the function
-                        signature from the symbol information.  */
-                     if (!TYPE_FN_FIELD_STUB (f, j))
-                       {
-                         int staticp = TYPE_FN_FIELD_STATIC_P (f, j);
-                         struct type *mtype = TYPE_FN_FIELD_TYPE (f, j);
-
-                         cp_type_print_method_args (mtype,
-                                                    "",
-                                                    method_name,
-                                                    staticp,
-                                                    stream, &local_flags);
-                       }
-                     else
-                       fprintf_filtered (stream,
-                                         _("<badly mangled name '%s'>"),
-                                         mangled_name);
-                   }
-                 else
-                   {
-                     char *p;
-                     char *demangled_no_class
-                       = remove_qualifiers (demangled_name);
-
-                     /* Get rid of the `static' appended by the
-                        demangler.  */
-                     p = strstr (demangled_no_class, " static");
-                     if (p != NULL)
-                       {
-                         int length = p - demangled_no_class;
-                         char *demangled_no_static;
-
-                         demangled_no_static
-                           = (char *) xmalloc (length + 1);
-                         strncpy (demangled_no_static,
-                                  demangled_no_class, length);
-                         *(demangled_no_static + length) = '\0';
-                         fputs_filtered (demangled_no_static, stream);
-                         xfree (demangled_no_static);
-                       }
-                     else
-                       fputs_filtered (demangled_no_class, stream);
-                     xfree (demangled_name);
-                   }
-
-                 do_cleanups (inner_cleanup);
-
-                 fprintf_filtered (stream, ";\n");
-               }
-           }
-
-         /* Print typedefs defined in this class.  */
-
-         if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
-           {
-             if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
-               fprintf_filtered (stream, "\n");
-
-             for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
-               {
-                 struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
-
-                 /* Dereference the typedef declaration itself.  */
-                 gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
-                 target = TYPE_TARGET_TYPE (target);
-
-                 if (need_access_label)
-                   {
-                     section_type = output_access_specifier
-                       (stream, section_type, level,
-                        TYPE_TYPEDEF_FIELD_PROTECTED (type, i),
-                        TYPE_TYPEDEF_FIELD_PRIVATE (type, i));
-                   }
-                 print_spaces_filtered (level + 4, stream);
-                 fprintf_filtered (stream, "typedef ");
-
-                 /* We want to print typedefs with substitutions
-                    from the template parameters or globally-known
-                    typedefs but not local typedefs.  */
-                 c_print_type (target,
-                               TYPE_TYPEDEF_FIELD_NAME (type, i),
-                               stream, show - 1, level + 4,
-                               &semi_local_flags);
-                 fprintf_filtered (stream, ";\n");
-               }
-           }
-
-           fprintfi_filtered (level, stream, "}");
-         }
-
-       do_cleanups (local_cleanups);
-      }
+      c_type_print_base_struct_union (type, stream, show, level, flags,
+                                     podata);
       break;
 
     case TYPE_CODE_ENUM:
@@ -1474,10 +1705,10 @@ c_type_print_base (struct type *type, struct ui_file *stream,
                print_spaces_filtered (level + 4, stream);
                /* We pass "show" here and not "show - 1" to get enum types
                   printed.  There's no other way to see them.  */
-               c_print_type (TYPE_FIELD_TYPE (type, i),
-                             TYPE_FIELD_NAME (type, i),
-                             stream, show, level + 4,
-                             &local_flags);
+               c_print_type_1 (TYPE_FIELD_TYPE (type, i),
+                               TYPE_FIELD_NAME (type, i),
+                               stream, show, level + 4,
+                               &local_flags, podata);
                fprintf_filtered (stream, " @%s",
                                  plongest (TYPE_FIELD_BITPOS (type, i)));
                if (TYPE_FIELD_BITSIZE (type, i) > 1)
@@ -1536,3 +1767,15 @@ c_type_print_base (struct type *type, struct ui_file *stream,
       break;
     }
 }
+
+/* See c_type_print_base_1.  */
+
+void
+c_type_print_base (struct type *type, struct ui_file *stream,
+                  int show, int level,
+                  const struct type_print_options *flags)
+{
+  struct print_offset_data podata;
+
+  c_type_print_base_1 (type, stream, show, level, flags, &podata);
+}
This page took 0.041776 seconds and 4 git commands to generate.