diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/c-typeprint.c | 4 | ||||
| -rw-r--r-- | gdb/compile/compile-c-symbols.c | 4 | ||||
| -rw-r--r-- | gdb/compile/compile-c-types.c | 6 | ||||
| -rw-r--r-- | gdb/compile/compile-cplus-types.c | 6 | ||||
| -rw-r--r-- | gdb/gdbtypes.h | 4 | ||||
| -rw-r--r-- | gdb/rust-lang.c | 4 |
7 files changed, 18 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3233cb5..f257a8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2020-07-12 Simon Marchi <simon.marchi@efficios.com> + * gdbtypes.h (TYPE_LOW_BOUND_KIND, + TYPE_HIGH_BOUND_KIND): Remove. Update all callers + to use dynamic_prop::kind. + +2020-07-12 Simon Marchi <simon.marchi@efficios.com> + * gdbtypes.h (TYPE_LOW_BOUND_UNDEFINED, TYPE_HIGH_BOUND_UNDEFINED): Remove. Update all callers to get the bound property's kind and check against diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index e10a485..9e408e1 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -780,8 +780,8 @@ c_type_print_varspec_suffix (struct type *type, fprintf_filtered (stream, (is_vector ? " __attribute__ ((vector_size(" : "[")); /* Bounds are not yet resolved, print a bounds placeholder instead. */ - if (TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCLIST) + if (type->index_type ()->bounds ()->high.kind () == PROP_LOCEXPR + || type->index_type ()->bounds ()->high.kind () == PROP_LOCLIST) fprintf_filtered (stream, "variable length"); else if (get_array_bounds (type, &low_bound, &high_bound)) fprintf_filtered (stream, "%s", diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index be2ca35..f4e0783 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -501,8 +501,8 @@ generate_vla_size (compile_instance *compiler, { case TYPE_CODE_RANGE: { - if (TYPE_HIGH_BOUND_KIND (type) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type) == PROP_LOCLIST) + if (type->bounds ()->high.kind () == PROP_LOCEXPR + || type->bounds ()->high.kind () == PROP_LOCLIST) { const struct dynamic_prop *prop = &type->bounds ()->high; std::string name = c_get_range_decl_name (prop); diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 3c900a2..2b25783 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -44,15 +44,15 @@ convert_array (compile_c_instance *context, struct type *type) element_type = context->convert_type (TYPE_TARGET_TYPE (type)); - if (TYPE_LOW_BOUND_KIND (range) != PROP_CONST) + if (range->bounds ()->low.kind () != PROP_CONST) return context->plugin ().error (_("array type with non-constant" " lower bound is not supported")); if (range->bounds ()->low.const_val () != 0) return context->plugin ().error (_("cannot convert array type with " "non-zero lower bound to C")); - if (TYPE_HIGH_BOUND_KIND (range) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (range) == PROP_LOCLIST) + if (range->bounds ()->high.kind () == PROP_LOCEXPR + || range->bounds ()->high.kind () == PROP_LOCLIST) { gcc_type result; diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index 4084f87..02df7ab 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -456,7 +456,7 @@ compile_cplus_convert_array (compile_cplus_instance *instance, struct type *range = type->index_type (); gcc_type element_type = instance->convert_type (TYPE_TARGET_TYPE (type)); - if (TYPE_LOW_BOUND_KIND (range) != PROP_CONST) + if (range->bounds ()->low.kind () != PROP_CONST) { const char *s = _("array type with non-constant" " lower bound is not supported"); @@ -472,8 +472,8 @@ compile_cplus_convert_array (compile_cplus_instance *instance, return instance->plugin ().error (s); } - if (TYPE_HIGH_BOUND_KIND (range) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (range) == PROP_LOCLIST) + if (range->bounds ()->high.kind () == PROP_LOCEXPR + || range->bounds ()->high.kind () == PROP_LOCLIST) { if (TYPE_VECTOR (type)) { diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 2d277ac..9be9705 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_HIGH_BOUND_KIND(range_type) \ - ((range_type)->bounds ()->high.kind ()) -#define TYPE_LOW_BOUND_KIND(range_type) \ - ((range_type)->bounds ()->low.kind ()) #define TYPE_BIT_STRIDE(range_type) \ ((range_type)->bounds ()->stride.const_val () \ * ((range_type)->bounds ()->flag_is_byte_stride ? 8 : 1)) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 31126a2..cedb15f 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -813,8 +813,8 @@ rust_internal_print_type (struct type *type, const char *varstring, stream, show - 1, level, flags, false, podata); - if (TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCLIST) + if (type->index_type ()->bounds ()->high.kind () == PROP_LOCEXPR + || type->index_type ()->bounds ()->high.kind () == PROP_LOCLIST) fprintf_filtered (stream, "; variable length"); else if (get_array_bounds (type, &low_bound, &high_bound)) fprintf_filtered (stream, "; %s", |