yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use enum accessibility in types and member functions

Browse Source 
This changes nested types and member functions to use the new
'accessibility' enum, rather than separate private/protected flags.
This is done for consistency, but it also lets us simplify some other
code in the next patch.

Acked-By: Simon Marchi <simon.marchi@efficios.com>
Reviewed-by: Keith Seitz <keiths@redhat.com>
This commit is contained in:
Tom Tromey 2023-10-27 10:51:50 -06:00
parent e17fd6c28e
commit 5028c9e206
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/dwarf2/read.c
View File

@ -11716,10 +11716,10 @@ dwarf2_add_type_defn (struct field_info *fip, struct die_info *die,
/* The assumed value if neither private nor protected. */
break;
case DW_ACCESS_private:
fp.is_private = 1;
fp.accessibility = accessibility::PRIVATE;
break;
case DW_ACCESS_protected:
fp.is_protected = 1;
fp.accessibility = accessibility::PROTECTED;
break;
}
@ -12078,10 +12078,10 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
switch (accessibility)
{
case DW_ACCESS_private:
fnp->is_private = 1;
fnp->accessibility = accessibility::PRIVATE;
break;
case DW_ACCESS_protected:
fnp->is_protected = 1;
fnp->accessibility = accessibility::PROTECTED;
break;
}

27
gdb/gdbtypes.h
View File

@ -1611,8 +1611,8 @@ struct fn_field
unsigned int is_const:1;
unsigned int is_volatile:1;
unsigned int is_private:1;
unsigned int is_protected:1;
/* Accessibility of the field. */
ENUM_BITFIELD (accessibility) accessibility : 2;
unsigned int is_artificial:1;
/* * A stub method only has some fields valid (but they are enough
@ -1657,11 +1657,8 @@ struct decl_field
struct type *type;
/* * True if this field was declared protected, false otherwise. */
unsigned int is_protected : 1;
/* * True if this field was declared private, false otherwise. */
unsigned int is_private : 1;
/* Accessibility of the field. */
ENUM_BITFIELD (accessibility) accessibility : 2;
};
/* * C++ language-specific information for TYPE_CODE_STRUCT and
@ -1984,8 +1981,10 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
#define TYPE_FN_FIELD_ARGS(thisfn, n) (((thisfn)[n].type)->fields ())
#define TYPE_FN_FIELD_CONST(thisfn, n) ((thisfn)[n].is_const)
#define TYPE_FN_FIELD_VOLATILE(thisfn, n) ((thisfn)[n].is_volatile)
#define TYPE_FN_FIELD_PRIVATE(thisfn, n) ((thisfn)[n].is_private)
#define TYPE_FN_FIELD_PROTECTED(thisfn, n) ((thisfn)[n].is_protected)
#define TYPE_FN_FIELD_PRIVATE(thisfn, n) \
((thisfn)[n].accessibility == accessibility::PRIVATE)
#define TYPE_FN_FIELD_PROTECTED(thisfn, n) \
((thisfn)[n].accessibility == accessibility::PROTECTED)
#define TYPE_FN_FIELD_ARTIFICIAL(thisfn, n) ((thisfn)[n].is_artificial)
#define TYPE_FN_FIELD_STUB(thisfn, n) ((thisfn)[n].is_stub)
#define TYPE_FN_FIELD_CONSTRUCTOR(thisfn, n) ((thisfn)[n].is_constructor)
@ -2008,9 +2007,9 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
#define TYPE_TYPEDEF_FIELD_COUNT(thistype) \
TYPE_CPLUS_SPECIFIC (thistype)->typedef_field_count
#define TYPE_TYPEDEF_FIELD_PROTECTED(thistype, n) \
TYPE_TYPEDEF_FIELD (thistype, n).is_protected
(TYPE_TYPEDEF_FIELD (thistype, n).accessibility == accessibility::PROTECTED)
#define TYPE_TYPEDEF_FIELD_PRIVATE(thistype, n) \
TYPE_TYPEDEF_FIELD (thistype, n).is_private
(TYPE_TYPEDEF_FIELD (thistype, n).accessibility == accessibility::PRIVATE)
#define TYPE_NESTED_TYPES_ARRAY(thistype) \
TYPE_CPLUS_SPECIFIC (thistype)->nested_types
@ -2023,9 +2022,11 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
#define TYPE_NESTED_TYPES_COUNT(thistype) \
TYPE_CPLUS_SPECIFIC (thistype)->nested_types_count
#define TYPE_NESTED_TYPES_FIELD_PROTECTED(thistype, n) \
TYPE_NESTED_TYPES_FIELD (thistype, n).is_protected
(TYPE_NESTED_TYPES_FIELD (thistype, n).accessibility \
== accessibility::PROTECTED)
#define TYPE_NESTED_TYPES_FIELD_PRIVATE(thistype, n) \
TYPE_NESTED_TYPES_FIELD (thistype, n).is_private
(TYPE_NESTED_TYPES_FIELD (thistype, n).accessibility \
== accessibility::PRIVATE)
#define TYPE_IS_OPAQUE(thistype) \
((((thistype)->code () == TYPE_CODE_STRUCT) \

4
gdb/stabsread.c
View File

@ -2372,10 +2372,10 @@ read_member_functions (struct stab_field_info *fip, const char **pp,
switch (*(*pp)++)
{
case VISIBILITY_PRIVATE:
new_sublist->fn_field.is_private = 1;
new_sublist->fn_field.accessibility = accessibility::PRIVATE;
break;
case VISIBILITY_PROTECTED:
new_sublist->fn_field.is_protected = 1;
new_sublist->fn_field.accessibility = accessibility::PROTECTED;
break;
}