From: Tom Tromey <tromey@adacore.com>
Date: Fri, 25 Jun 2021 14:01:15 +0000 (-0600)
Subject: Decode Ada types in Python layer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67470e9d8be180344494635dcef34e054938bfb8;p=binutils-gdb.git

Decode Ada types in Python layer

GNAT emits encoded type names, but these aren't usually of interest to
users.  The Ada language code in gdb hides this oddity -- but the
Python layer does not.  This patch changes the Python code to use the
decoded Ada type name, when appropriate.

I looked at decoding Ada type names during construction, as that would
be cleaner.  However, the Ada support in gdb relies on the encodings
at various points, so this isn't really doable right now.

2021-06-25  Tom Tromey  <tromey@adacore.com>

	* python/py-type.c (typy_get_name): Decode an Ada type name.

gdb/testsuite/ChangeLog
2021-06-25  Tom Tromey  <tromey@adacore.com>

	* gdb.ada/py_range.exp: Add type name test cases.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d56f1c7bc3..c973f4381b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-25  Tom Tromey  <tromey@adacore.com>
+
+	* python/py-type.c (typy_get_name): Decode an Ada type name.
+
 2021-06-25  Tom Tromey  <tromey@adacore.com>
 
 	* ada-lang.c (ada_decode): Add wrap parameter.
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 4f5f42529c2..04d1c7a0ee7 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -27,6 +27,7 @@
 #include "objfiles.h"
 #include "language.h"
 #include "typeprint.h"
+#include "ada-lang.h"
 
 struct type_object
 {
@@ -393,6 +394,14 @@ typy_get_name (PyObject *self, void *closure)
 
   if (type->name () == NULL)
     Py_RETURN_NONE;
+  /* Ada type names are encoded, but it is better for users to see the
+     decoded form.  */
+  if (ADA_TYPE_P (type))
+    {
+      std::string name = ada_decode (type->name (), false);
+      if (!name.empty ())
+	return PyString_FromString (name.c_str ());
+    }
   return PyString_FromString (type->name ());
 }
 
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d12aba9f8ac..e5164c731ad 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-25  Tom Tromey  <tromey@adacore.com>
+
+	* gdb.ada/py_range.exp: Add type name test cases.
+
 2021-06-24  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/info-macros.exp: Add <EOL> after trailing whitespace in
diff --git a/gdb/testsuite/gdb.ada/py_range.exp b/gdb/testsuite/gdb.ada/py_range.exp
index 1a619b70ef7..3e6efa3e932 100644
--- a/gdb/testsuite/gdb.ada/py_range.exp
+++ b/gdb/testsuite/gdb.ada/py_range.exp
@@ -40,3 +40,8 @@ gdb_test "python print(int(gdb.parse_and_eval('si')))" \
 
 gdb_test "python print(int(gdb.parse_and_eval('ir')))" \
          "974"
+
+gdb_test "python print(gdb.parse_and_eval('si').type)" \
+    "foo\\.small_integer" "print type"
+gdb_test "python print(gdb.parse_and_eval('si').type.name)" \
+    "foo\\.small_integer" "print type name"