From: Tom de Vries <tdevries@suse.de>
Date: Tue, 15 Apr 2025 14:59:32 +0000 (+0200)
Subject: [gdb/ada] Fix gdb.ada/overloads.exp on s390x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bef406490d0ecf2e8710a9ed28b0b377653159f;p=thirdparty%2Fbinutils-gdb.git

[gdb/ada] Fix gdb.ada/overloads.exp on s390x

On s390x-linux, with test-case gdb.ada/overloads.exp and gcc 7.5.0 I run into:
...
(gdb) print Oload(CA)^M
Could not find a match for oload^M
(gdb) FAIL: $exp: print Oload(CA)
...

The mismatch happens here in ada_type_match:
...
      return ftype->code () == atype->code ();
...
with:
...
(gdb) p ftype->code ()
$3 = TYPE_CODE_TYPEDEF
(gdb) p atype->code ()
$4 = TYPE_CODE_ARRAY
...

At the start of ada_type_match, typedefs are skipped:
...
  ftype = ada_check_typedef (ftype);
  atype = ada_check_typedef (atype);
...
but immediately after this, refs are skipped:
...
  if (ftype->code () == TYPE_CODE_REF)
    ftype = ftype->target_type ();
  if (atype->code () == TYPE_CODE_REF)
    atype = atype->target_type ();
...
which in this case makes ftype a typedef.

Fix this by using ada_check_typedef after skipping the refs as well.

Tested on x86_64-linux and s390x-linux.

Approved-By: Tom Tromey <tom@tromey.com>

PR ada/32409
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32409
---

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 9d354407bc3..38c79740290 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3950,9 +3950,9 @@ ada_type_match (struct type *ftype, struct type *atype)
   atype = ada_check_typedef (atype);
 
   if (ftype->code () == TYPE_CODE_REF)
-    ftype = ftype->target_type ();
+    ftype = ada_check_typedef (ftype->target_type ());
   if (atype->code () == TYPE_CODE_REF)
-    atype = atype->target_type ();
+    atype = ada_check_typedef (atype->target_type ());
 
   switch (ftype->code ())
     {