From 4d072ce478ebb605b2f0ca326c7c3168d4ee5989 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 24 Apr 2014 12:09:11 -0400 Subject: [PATCH] Unnecessary XA type handling in ada_varobj_describe_simple_array_child ada-varobj.c::ada_varobj_describe_simple_array_child only ever gets called after all GNAT encodings have been applied to (parent_value, parent_type). So there is no point in redoing it partially by checking for parallel XA types again. gdb/ChangeLog: * ada-varobj.c (ada_varobj_describe_simple_array_child): Remove handling of parallel ___XA types. --- gdb/ChangeLog | 5 +++++ gdb/ada-varobj.c | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cd43f6ee559..f3f02e744d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-04-28 Joel Brobecker + + * ada-varobj.c (ada_varobj_describe_simple_array_child): Remove + handling of parallel ___XA types. + 2014-04-28 Joel Brobecker * ada-lang.c (ada_evaluate_subexp) : Remove diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c index 3da6018920d..b9f83be6ad7 100644 --- a/gdb/ada-varobj.c +++ b/gdb/ada-varobj.c @@ -579,18 +579,12 @@ ada_varobj_describe_simple_array_child (struct value *parent_value, struct type **child_type, char **child_path_expr) { - struct type *index_desc_type; struct type *index_type; int real_index; gdb_assert (TYPE_CODE (parent_type) == TYPE_CODE_ARRAY); - index_desc_type = ada_find_parallel_type (parent_type, "___XA"); - ada_fixup_array_indexes_type (index_desc_type); - if (index_desc_type) - index_type = TYPE_FIELD_TYPE (index_desc_type, 0); - else - index_type = TYPE_INDEX_TYPE (parent_type); + index_type = TYPE_INDEX_TYPE (parent_type); real_index = child_index + ada_discrete_type_low_bound (index_type); if (child_name) -- 2.30.2