diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc998d5ee58..329c3517adb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-08-31 Simon Marchi + + * dwarf2/read.c (struct field_info): Fix indentation. + 2020-08-31 Simon Marchi * frame-unwind.h (frame_prev_register_ftype): Fix adjective diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 0ac8533263a..fe66dd36fca 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1190,40 +1190,40 @@ struct fnfieldlist pass lists of data member fields and lists of member function fields in an instance of a field_info structure, as defined below. */ struct field_info +{ + /* List of data member and baseclasses fields. */ + std::vector fields; + std::vector baseclasses; + + /* Set if the accessibility of one of the fields is not public. */ + int non_public_fields = 0; + + /* Member function fieldlist array, contains name of possibly overloaded + member function, number of overloaded member functions and a pointer + to the head of the member function field chain. */ + std::vector fnfieldlists; + + /* typedefs defined inside this class. TYPEDEF_FIELD_LIST contains head of + a NULL terminated list of TYPEDEF_FIELD_LIST_COUNT elements. */ + std::vector typedef_field_list; + + /* Nested types defined by this class and the number of elements in this + list. */ + std::vector nested_types_list; + + /* If non-null, this is the variant part we are currently + reading. */ + variant_part_builder *current_variant_part = nullptr; + /* This holds all the top-level variant parts attached to the type + we're reading. */ + std::vector variant_parts; + + /* Return the total number of fields (including baseclasses). */ + int nfields () const { - /* List of data member and baseclasses fields. */ - std::vector fields; - std::vector baseclasses; - - /* Set if the accessibility of one of the fields is not public. */ - int non_public_fields = 0; - - /* Member function fieldlist array, contains name of possibly overloaded - member function, number of overloaded member functions and a pointer - to the head of the member function field chain. */ - std::vector fnfieldlists; - - /* typedefs defined inside this class. TYPEDEF_FIELD_LIST contains head of - a NULL terminated list of TYPEDEF_FIELD_LIST_COUNT elements. */ - std::vector typedef_field_list; - - /* Nested types defined by this class and the number of elements in this - list. */ - std::vector nested_types_list; - - /* If non-null, this is the variant part we are currently - reading. */ - variant_part_builder *current_variant_part = nullptr; - /* This holds all the top-level variant parts attached to the type - we're reading. */ - std::vector variant_parts; - - /* Return the total number of fields (including baseclasses). */ - int nfields () const - { - return fields.size () + baseclasses.size (); - } - }; + return fields.size () + baseclasses.size (); + } +}; /* Loaded secondary compilation units are kept in memory until they have not been referenced for the processing of this many