From 66d6346b25658e74251d5f0f1647e59035177d9c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 4 Aug 2020 14:47:39 -0400 Subject: [PATCH] gdb: remove TYPE_DYN_PROP_ADDR Remove TYPE_DYN_PROP_ADDR, replacing its uses with calling dynamic_prop::const_val directly. gdb/ChangeLog: * gdbtypes.h (TYPE_DYN_PROP_ADDR): Remove, replace uses with dynamic_prop::const_val. Change-Id: Ie99b9cd9a0627488c1c69a75e57f020d34e392af --- gdb/ChangeLog | 5 +++++ gdb/gdbtypes.c | 4 ++-- gdb/gdbtypes.h | 4 ---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da68b1194e8..bcf3963fec3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-08-04 Simon Marchi + + * gdbtypes.h (TYPE_DYN_PROP_ADDR): Remove, replace uses with + dynamic_prop::const_val. + 2020-08-04 Simon Marchi * gdbtypes.h (TYPE_DYN_PROP_KIND): Remove, replace uses with diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 4b1f40ab77d..0cd4b194d98 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4134,7 +4134,7 @@ type_not_allocated (const struct type *type) struct dynamic_prop *prop = TYPE_ALLOCATED_PROP (type); return (prop != nullptr && prop->kind () == PROP_CONST - && !TYPE_DYN_PROP_ADDR (prop)); + && prop->const_val () != 0); } /* Associated status of type TYPE. Return zero if type TYPE is associated. @@ -4146,7 +4146,7 @@ type_not_associated (const struct type *type) struct dynamic_prop *prop = TYPE_ASSOCIATED_PROP (type); return (prop != nullptr && prop->kind () == PROP_CONST - && !TYPE_DYN_PROP_ADDR (prop)); + && prop->const_val () != 0); } /* 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 de54a5ed73b..55a6dafb7e2 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1635,10 +1635,6 @@ extern bool set_type_align (struct type *, ULONGEST); #define TYPE_ASSOCIATED_PROP(thistype) \ ((thistype)->dyn_prop (DYN_PROP_ASSOCIATED)) -/* Attribute accessors for dynamic properties. */ -#define TYPE_DYN_PROP_ADDR(dynprop) \ - (dynprop->const_val ()) - /* C++ */ #define TYPE_SELF_TYPE(thistype) internal_type_self_type (thistype) -- 2.30.2