MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb: remove TYPE_DYN_PROP_KIND

Browse Source 
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
This commit is contained in:
Simon Marchi 2020-08-04 14:47:36 -04:00
parent 51d6067d78
commit 8a6d5e35fe
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-08-04 Simon Marchi <simon.marchi@polymtl.ca>
* gdbtypes.h (TYPE_DYN_PROP_KIND): Remove, replace uses with
dynamic_prop::kind.
2020-08-04 Simon Marchi <simon.marchi@polymtl.ca>
* gdbtypes.h (TYPE_DYN_PROP_BATON): Remove.

6
gdb/f-typeprint.c
View File

@ -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. */

8
gdb/gdbtypes.c
View File

@ -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. */

2
gdb/gdbtypes.h
View File

@ -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++ */