From: Joel Brobecker <brobecker@adacore.com>
Date: Thu, 24 Apr 2014 16:09:11 +0000 (-0400)
Subject: Unnecessary XA type handling in ada_varobj_describe_simple_array_child
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d072ce478ebb605b2f0ca326c7c3168d4ee5989;p=binutils-gdb.git

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.
---

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  <brobecker@adacore.com>
+
+	* ada-varobj.c (ada_varobj_describe_simple_array_child): Remove
+	handling of parallel ___XA types.
+
 2014-04-28  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.c (ada_evaluate_subexp) <OP_VAR_VALUE>: 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)