From 064d9cb9e765b0a064a2e442df0e7bcc79f98c18 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 12 Jul 2020 22:58:52 -0400 Subject: [PATCH] gdb: remove TYPE_LOW_BOUND_UNDEFINED and TYPE_HIGH_BOUND_UNDEFINED Remove the macros, use the getters of `struct dynamic_prop` instead. gdb/ChangeLog: * gdbtypes.h (TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): Remove. Update all callers to get the bound property's kind and check against PROP_UNDEFINED. Change-Id: I6a7641ac1aa3fa7fca0c21f00556f185f2e2d68c --- gdb/ChangeLog | 7 +++++++ gdb/ada-tasks.c | 4 ++-- gdb/eval.c | 3 ++- gdb/gdbtypes.c | 7 ++++--- gdb/gdbtypes.h | 8 ++------ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e6acbb2fd83..3233cb5fa8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-07-12 Simon Marchi + + * gdbtypes.h (TYPE_LOW_BOUND_UNDEFINED, + TYPE_HIGH_BOUND_UNDEFINED): Remove. Update all callers + to get the bound property's kind and check against + PROP_UNDEFINED. + 2020-07-12 Simon Marchi * gdbtypes.h (TYPE_LOW_BOUND, TYPE_HIGH_BOUND): Remove. Update diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index 7870a7847ad..27b458767a7 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -896,8 +896,8 @@ ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data) && eltype->code () == TYPE_CODE_PTR) idxtype = check_typedef (type->index_type ()); if (idxtype != NULL - && !TYPE_LOW_BOUND_UNDEFINED (idxtype) - && !TYPE_HIGH_BOUND_UNDEFINED (idxtype)) + && idxtype->bounds ()->low.kind () != PROP_UNDEFINED + && idxtype->bounds ()->high.kind () != PROP_UNDEFINED) { data->known_tasks_element = eltype; data->known_tasks_length = diff --git a/gdb/eval.c b/gdb/eval.c index 2191e190927..dacd46da44f 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -3212,7 +3212,8 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos, type = value_type (val); if (type->code () == TYPE_CODE_ARRAY && is_dynamic_type (type->index_type ()) - && TYPE_HIGH_BOUND_UNDEFINED (type->index_type ())) + && (type->index_type ()->bounds ()->high.kind () + == PROP_UNDEFINED)) return allocate_optimized_out_value (size_type); } else diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 507d2f6dacb..227f696b736 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5117,10 +5117,11 @@ recursive_dump_type (struct type *type, int spaces) { printfi_filtered (spaces, "low %s%s high %s%s\n", plongest (type->bounds ()->low.const_val ()), - TYPE_LOW_BOUND_UNDEFINED (type) ? " (undefined)" : "", + (type->bounds ()->low.kind () == PROP_UNDEFINED + ? " (undefined)" : ""), plongest (type->bounds ()->high.const_val ()), - TYPE_HIGH_BOUND_UNDEFINED (type) - ? " (undefined)" : ""); + (type->bounds ()->high.kind () == PROP_UNDEFINED + ? " (undefined)" : "")); } switch (TYPE_SPECIFIC_FIELD (type)) diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 044af479727..2d277ac688d 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1594,10 +1594,6 @@ extern unsigned type_align (struct type *); space in struct type. */ extern bool set_type_align (struct type *, ULONGEST); -#define TYPE_LOW_BOUND_UNDEFINED(range_type) \ - (TYPE_LOW_BOUND_KIND(range_type) == PROP_UNDEFINED) -#define TYPE_HIGH_BOUND_UNDEFINED(range_type) \ - (TYPE_HIGH_BOUND_KIND(range_type) == PROP_UNDEFINED) #define TYPE_HIGH_BOUND_KIND(range_type) \ ((range_type)->bounds ()->high.kind ()) #define TYPE_LOW_BOUND_KIND(range_type) \ @@ -1637,9 +1633,9 @@ extern bool set_type_align (struct type *, ULONGEST); index type. */ #define TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED(arraytype) \ - TYPE_HIGH_BOUND_UNDEFINED((arraytype)->index_type ()) + ((arraytype)->index_type ()->bounds ()->high.kind () == PROP_UNDEFINED) #define TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED(arraytype) \ - TYPE_LOW_BOUND_UNDEFINED((arraytype)->index_type ()) + ((arraytype)->index_type ()->bounds ()->low.kind () == PROP_UNDEFINED) #define TYPE_ARRAY_UPPER_BOUND_VALUE(arraytype) \ ((arraytype)->index_type ()->bounds ()->high.const_val ()) -- 2.30.2