diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-09-23 23:51:40 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-10-29 16:44:21 -0400 |
| commit | d8557c3d229589c690a1bef92be434eb663e3bb6 (patch) | |
| tree | f7ddaece67de18f30e1a22194974f417732d6f11 /gdb | |
| parent | 31a1516a815ea3699cefdf92be60680c56cd6e8f (diff) | |
| download | gdb-d8557c3d229589c690a1bef92be434eb663e3bb6.zip gdb-d8557c3d229589c690a1bef92be434eb663e3bb6.tar.gz gdb-d8557c3d229589c690a1bef92be434eb663e3bb6.tar.bz2 | |
gdb: remove FIELD_DWARF_BLOCK macro
Remove FIELD_DWARF_BLOCK, replace its uses with field::loc_dwarf_block.
Change-Id: I66b7d6a960cb5e341e61e21bd3cc9a6ac26de6a8
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/dwarf2/loc.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 4 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index f7ec268..eb128fa 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -649,7 +649,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, struct type *caller_core_addr_type; struct gdbarch *caller_arch; - dwarf_block = FIELD_DWARF_BLOCK (call_site->target); + dwarf_block = call_site->target.loc_dwarf_block (); if (dwarf_block == NULL) { struct bound_minimal_symbol msym; diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index db70475..8cfb9db 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4233,8 +4233,8 @@ check_types_equal (struct type *type1, struct type *type2, { struct dwarf2_locexpr_baton *block1, *block2; - block1 = FIELD_DWARF_BLOCK (*field1); - block2 = FIELD_DWARF_BLOCK (*field2); + block1 = field1->loc_dwarf_block (); + block2 = field2->loc_dwarf_block (); if (block1->per_cu != block2->per_cu || block1->size != block2->size || memcmp (block1->data, block2->data, block1->size) != 0) diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index e3a3d98..e68aab5 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -2125,7 +2125,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *); (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \ : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (index))) -#define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc_dwarf_block ()) #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial) #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize) @@ -2134,7 +2133,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_FIELD_ENUMVAL(thistype, n) ((thistype)->field (n).loc_enumval ()) #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) ((thistype)->field (n).loc_physname ()) #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) ((thistype)->field (n).loc_physaddr ()) -#define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK ((thistype)->field (n)) +#define TYPE_FIELD_DWARF_BLOCK(thistype, n) ((thistype)->field (n).loc_dwarf_block ()) #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n)) #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE((thistype)->field (n)) #define TYPE_FIELD_PACKED(thistype, n) (FIELD_BITSIZE((thistype)->field (n))!=0) |