From 8a6d5e35fec07197dac1cf7d2a3e62d58567d4e3 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 4 Aug 2020 14:47:36 -0400 Subject: [PATCH] gdb: remove TYPE_DYN_PROP_KIND Replace uses with calling the dynamic_prop::kind method directly. gdb/ChangeLog: * gdbtypes.h (TYPE_DYN_PROP_KIND): Remove, replace uses with dynamic_prop::kind. Change-Id: I78a3e2890f0b3e3950e9a19ad657b976cbb9610b --- gdb/ChangeLog | 5 +++++ gdb/f-typeprint.c | 6 +++--- gdb/gdbtypes.c | 8 ++++---- gdb/gdbtypes.h | 2 -- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a2dbd419a7b..da68b1194e8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-08-04 Simon Marchi + + * gdbtypes.h (TYPE_DYN_PROP_KIND): Remove, replace uses with + dynamic_prop::kind. + 2020-08-04 Simon Marchi * gdbtypes.h (TYPE_DYN_PROP_BATON): Remove. diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index 65ec93af9f4..c3a01673d2b 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -196,11 +196,11 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, else if (type_not_allocated (type)) print_rank_only = true; else if ((TYPE_ASSOCIATED_PROP (type) - && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ASSOCIATED_PROP (type))) + && PROP_CONST != TYPE_ASSOCIATED_PROP (type)->kind ()) || (TYPE_ALLOCATED_PROP (type) - && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_ALLOCATED_PROP (type))) + && PROP_CONST != TYPE_ALLOCATED_PROP (type)->kind ()) || (TYPE_DATA_LOCATION (type) - && PROP_CONST != TYPE_DYN_PROP_KIND (TYPE_DATA_LOCATION (type)))) + && PROP_CONST != TYPE_DATA_LOCATION (type)->kind ())) { /* This case exist when we ptype a typename which has the dynamic properties but cannot be resolved as there is no object. */ diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index e87648813ec..4b1f40ab77d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4133,8 +4133,8 @@ type_not_allocated (const struct type *type) { struct dynamic_prop *prop = TYPE_ALLOCATED_PROP (type); - return (prop && TYPE_DYN_PROP_KIND (prop) == PROP_CONST - && !TYPE_DYN_PROP_ADDR (prop)); + return (prop != nullptr && prop->kind () == PROP_CONST + && !TYPE_DYN_PROP_ADDR (prop)); } /* Associated status of type TYPE. Return zero if type TYPE is associated. @@ -4145,8 +4145,8 @@ type_not_associated (const struct type *type) { struct dynamic_prop *prop = TYPE_ASSOCIATED_PROP (type); - return (prop && TYPE_DYN_PROP_KIND (prop) == PROP_CONST - && !TYPE_DYN_PROP_ADDR (prop)); + return (prop != nullptr && prop->kind () == PROP_CONST + && !TYPE_DYN_PROP_ADDR (prop)); } /* rank_one_type helper for when PARM's type code is TYPE_CODE_PTR. */ diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 9ea23718ffb..de54a5ed73b 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1638,8 +1638,6 @@ extern bool set_type_align (struct type *, ULONGEST); /* Attribute accessors for dynamic properties. */ #define TYPE_DYN_PROP_ADDR(dynprop) \ (dynprop->const_val ()) -#define TYPE_DYN_PROP_KIND(dynprop) \ - (dynprop->kind ()) /* C++ */ -- 2.30.2