diff options
author | Simon Marchi <simon.marchi@efficios.com> | 2020-07-12 23:05:08 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-07-12 23:06:12 -0400 |
commit | cf88be6855e5bb3d43e1fd78f28aeb2ec5fc11a1 (patch) | |
tree | 7934180bead39035aa5c7f5c00fbbfb2d4d79277 /gdb/c-varobj.c | |
parent | 509971ae766fdba08437cbd8bc266aae8d2aa9e9 (diff) | |
download | gdb-cf88be6855e5bb3d43e1fd78f28aeb2ec5fc11a1.zip gdb-cf88be6855e5bb3d43e1fd78f28aeb2ec5fc11a1.tar.gz gdb-cf88be6855e5bb3d43e1fd78f28aeb2ec5fc11a1.tar.bz2 |
gdb: make type::bounds work for array and string types
Getting the bounds of an array (or string) type is a common operation,
and is currently done through its index type:
my_array_type->index_type ()->bounds ()
I think it would make sense to let the `type::bounds` methods work for
arrays and strings, as a shorthand for this. It's natural that when
asking for the bounds of an array, we get the bounds of the range type
used as its index type. In a way, it's equivalent as the now-removed
TYPE_ARRAY_{LOWER,UPPER}_BOUND_IS_UNDEFINED and
TYPE_ARRAY_{LOWER,UPPER}_BOUND_VALUE, except it returns the
`range_bounds` object. The caller is then responsible for getting the
property it needs in it.
I updated all the spots I could find that could take advantage of this.
Note that this also makes `type::bit_stride` work on array types, since
`type::bit_stride` uses `type::bounds`. `my_array_type->bit_stride ()`
now returns the bit stride of the array's index type. So some spots
are also changed to take advantage of this.
gdb/ChangeLog:
* gdbtypes.h (struct type) <bounds>: Handle array and string
types.
* ada-lang.c (assign_aggregate): Use type::bounds on
array/string type.
* c-typeprint.c (c_type_print_varspec_suffix): Likewise.
* c-varobj.c (c_number_of_children): Likewise.
(c_describe_child): Likewise.
* eval.c (evaluate_subexp_for_sizeof): Likewise.
* f-typeprint.c (f_type_print_varspec_suffix): Likewise.
(f_type_print_base): Likewise.
* f-valprint.c (f77_array_offset_tbl): Likewise.
(f77_get_upperbound): Likewise.
(f77_print_array_1): Likewise.
* guile/scm-type.c (gdbscm_type_range): Likewise.
* m2-typeprint.c (m2_array): Likewise.
(m2_is_long_set_of_type): Likewise.
* m2-valprint.c (get_long_set_bounds): Likewise.
* p-typeprint.c (pascal_type_print_varspec_prefix): Likewise.
* python/py-type.c (typy_range): Likewise.
* rust-lang.c (rust_internal_print_type): Likewise.
* type-stack.c (type_stack::follow_types): Likewise.
* valarith.c (value_subscripted_rvalue): Likewise.
* valops.c (value_cast): Likewise.
Change-Id: I5c0c08930bffe42fd69cb4bfcece28944dd88d1f
Diffstat (limited to 'gdb/c-varobj.c')
-rw-r--r-- | gdb/c-varobj.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c index 2bcfe86..56354e5 100644 --- a/gdb/c-varobj.c +++ b/gdb/c-varobj.c @@ -192,7 +192,7 @@ c_number_of_children (const struct varobj *var) { case TYPE_CODE_ARRAY: if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (target) > 0 - && (type->index_type ()->bounds ()->high.kind () != PROP_UNDEFINED)) + && (type->bounds ()->high.kind () != PROP_UNDEFINED)) children = TYPE_LENGTH (type) / TYPE_LENGTH (target); else /* If we don't know how many elements there are, don't display @@ -306,14 +306,13 @@ c_describe_child (const struct varobj *parent, int index, { case TYPE_CODE_ARRAY: if (cname) - *cname = int_string (index - + type->index_type ()->bounds ()->low.const_val (), + *cname = int_string (index + type->bounds ()->low.const_val (), 10, 1, 0, 0); if (cvalue && value) { int real_index - = index + type->index_type ()->bounds ()->low.const_val (); + = index + type->bounds ()->low.const_val (); try { @@ -330,7 +329,7 @@ c_describe_child (const struct varobj *parent, int index, if (cfull_expression) *cfull_expression = string_printf ("(%s)[%s]", parent_expression.c_str (), - int_string (index + type->index_type ()->bounds ()->low.const_val (), + int_string (index + type->bounds ()->low.const_val (), 10, 1, 0, 0)); break; |