diff mbox series

[gdb/ada] Extend type equivalence test in ada_resolve_enum

Message ID 20230907144233.14505-1-tdevries@suse.de
State Committed
Headers
Series [gdb/ada] Extend type equivalence test in ada_resolve_enum |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Patch failed to apply

Commit Message

Tom de Vries Sept. 7, 2023, 2:42 p.m. UTC 
  When running test-case gdb.ada/local-enum.exp with target board debug-types, I
run into:
...
(gdb) print v1(three)^M
No name 'three' in enumeration type 'local__e1'^M
(gdb) FAIL: gdb.ada/local-enum.exp: print v1 element
...

The array V1 is of type A1 which is an array with index type E1, containing
"three" as enumerator:
...
  type E1 is (one, two, three);
  type A1 is array (E1) of Integer;
  V1 : A1 := (0, 1, 2);
...

There's also a type E2 that contains three as enumerator:
...
  type E2 is (three, four, five);
...

When doing "print v1(three)", it's the job of ada_resolve_enum to resolve
"three" to type E1 rather than type E2.

When using target board debug-types, the enums E1 and E2 are replicated in the
.debug_types section, and consequently in ada_resolve_enum the type
equivalence check using a pointer comparison fails:
...
  for (int i = 0; i < syms.size (); ++i)
    {
      /* We already know the name matches, so we're just looking for
	 an element of the correct enum type.  */
      if (ada_check_typedef (syms[i].symbol->type ()) == context_type)
 	return i;
    }
...

Fix this by also trying a structural comparison using
ada_identical_enum_types_p.

Tested on x86_64-linux.

PR ada/29335
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29335
---
 gdb/ada-lang.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)


base-commit: 4d944db22c351296bad0b54d6a1857ad1fbde575

Comments

Tom Tromey Sept. 7, 2023, 6:36 p.m. UTC | #1 
>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:

Tom> When using target board debug-types, the enums E1 and E2 are replicated in the
Tom> .debug_types section, and consequently in ada_resolve_enum the type
Tom> equivalence check using a pointer comparison fails:
Tom> ...
Tom>   for (int i = 0; i < syms.size (); ++i)
Tom>     {
Tom>       /* We already know the name matches, so we're just looking for
Tom> 	 an element of the correct enum type.  */
Tom>       if (ada_check_typedef (syms[i].symbol->type ()) == context_type)
Tom>  	return i;
Tom>     }
Tom> ...

Tom> Fix this by also trying a structural comparison using
Tom> ada_identical_enum_types_p.

Thank you.  I think this is ok.
Approved-By: Tom Tromey <tom@tromey.com>

Tom
diff mbox series

Patch

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index c0cc512bfa3..7b61cce9341 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -202,6 +202,7 @@  static struct type *ada_find_any_type (const char *name);
 static symbol_name_matcher_ftype *ada_get_symbol_name_matcher
   (const lookup_name_info &lookup_name);
 
+static int ada_identical_enum_types_p (struct type *type1, struct type *type2);
 
 
 /* The character set used for source files.  */
@@ -3799,11 +3800,24 @@  ada_resolve_enum (std::vector<struct block_symbol> &syms,
   gdb_assert (context_type->code () == TYPE_CODE_ENUM);
   context_type = ada_check_typedef (context_type);
 
+  /* We already know the name matches, so we're just looking for
+     an element of the correct enum type.  */
+  struct type *type1 = context_type;
   for (int i = 0; i < syms.size (); ++i)
     {
-      /* We already know the name matches, so we're just looking for
-	 an element of the correct enum type.  */
-      if (ada_check_typedef (syms[i].symbol->type ()) == context_type)
+      struct type *type2 = ada_check_typedef (syms[i].symbol->type ());
+      if (type1 == type2)
+	return i;
+    }
+
+  for (int i = 0; i < syms.size (); ++i)
+    {
+      struct type *type2 = ada_check_typedef (syms[i].symbol->type ());
+      if (type1->num_fields () != type2->num_fields ())
+	continue;
+      if (strcmp (type1->name (), type2->name ()) != 0)
+	continue;
+      if (ada_identical_enum_types_p (type1, type2))
 	return i;
     }