Add an objfile getter to gdb.Type

This allows users of the Python API to find the objfile where a type
was defined.

gdb/ChangeLog:

gdb/ChangeLog
2019-06-04  Christian Biesinger  <cbiesinger@google.com>

	Add objfile property to gdb.Type.
	* gdb/NEWS: Mention Python API addition.
	* gdb/python/py-type.c (typy_get_objfile): New method.

gdb/doc/ChangeLog
2019-06-04  Christian Biesinger  <cbiesinger@google.com>

	* gdb/doc/python.texi: Document new gdb.Type.objfile property.

gdb/testsuite/ChangeLog
2019-06-04  Christian Biesinger  <cbiesinger@google.com>

	* gdb/testsuite/gdb.python/py-type.exp: Test for new
	  gdb.Type.objfile property.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c17836ecb1ed2f751ca2f36b362b0ea9f281f3d1..933f23249ffc738bb130ca1f772e9522cf1eca58 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-04  Christian Biesinger  <cbiesinger@google.com>
+
+       Add objfile property to gdb.Type.
+       * gdb/NEWS: Mention Python API addition.
+       * gdb/python/py-type.c (typy_get_objfile): New method.
+
 2019-06-03  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
        * NEWS: Mention the new set|show style [title|highlight].

diff --git a/gdb/NEWS b/gdb/NEWS
index 41f4f7a8529057e6a2a8d1eb49dc877c09f8f590..ded1fce406c3acbbd09fad0ff7315d4965878d84 100644 (file)
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -27,6 +27,9 @@
      'array_indexes', 'symbols', 'unions', 'deref_refs', 'actual_objects',
      'static_members', 'max_elements', 'repeat_threshold', and 'format'.
 
+  ** gdb.Type has a new property 'objfile' which returns the objfile the
+     type was defined in.
+
 * New built-in convenience variables $_shell_exitcode and $_shell_exitsignal
   provide the exitcode or exit status of the shell commands launched by
   GDB commands such as "shell", "pipe" and "make".

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 59de4e6945fabb76c00536027ee9758f417ccd0c..ea98096845a5487a71f033bab9911eb05666a139 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-04  Christian Biesinger  <cbiesinger@google.com>
+
+       * gdb/doc/python.texi: Document new gdb.Type.objfile property.
+
 2019-06-03  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
        * gdb.texinfo (Help): Document the new -v apropos flag.

diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi
index 98e52bb770ca8f0e94b7e592720a6957458e98e6..f769ad03a2b3b4455f457eae21977a8d1479c7c7 100644 (file)
--- a/gdb/doc/python.texi
+++ b/gdb/doc/python.texi
@@ -1087,6 +1087,11 @@ languages have this concept.  If this type has no tag name, then
 @code{None} is returned.
 @end defvar
 
+@defvar Type.objfile
+The @code{gdb.Objfile} that this type was defined in, or @code{None} if
+there is no associated objfile.
+@end defvar
+
 The following methods are provided:
 
 @defun Type.fields ()

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 22cc658a8b4eda4585637f593b442bfd91796797..7b99beacae02ad3b1e535aaf0fcb87c434dd4de4 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -413,6 +413,18 @@ typy_get_tag (PyObject *self, void *closure)
   return PyString_FromString (tagname);
 }
 
+/* Return the type's objfile, or None.  */
+static PyObject *
+typy_get_objfile (PyObject *self, void *closure)
+{
+  struct type *type = ((type_object *) self)->type;
+  struct objfile *objfile = TYPE_OBJFILE (type);
+
+  if (objfile == nullptr)
+    Py_RETURN_NONE;
+  return objfile_to_objfile_object (objfile).release ();
+}
+
 /* Return the type, stripped of typedefs. */
 static PyObject *
 typy_strip_typedefs (PyObject *self, PyObject *args)
@@ -1419,6 +1431,8 @@ static gdb_PyGetSetDef type_object_getset[] =
     "The size of this type, in bytes.", NULL },
   { "tag", typy_get_tag, NULL,
     "The tag name for this type, or None.", NULL },
+  { "objfile", typy_get_objfile, NULL,
+    "The objfile this type was defined in, or None.", NULL },
   { NULL }
 };
 

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 75f87f51b9b434bf99fb5ad0f537a44420f68305..af451fa4e12b8f7090eac86e2b1236b93e7ea330 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-04  Christian Biesinger  <cbiesinger@google.com>
+
+       * gdb/testsuite/gdb.python/py-type.exp: Test for new
+         gdb.Type.objfile property.
+
 2019-06-03  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
        * lib/gdb.exp (help_list_trailer): New regexp variable

diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 734f9b40fd124bdd61cdaf826e12bee514df9cfb..da4d4a7228348526a1e2c0d52d68735516e510a9 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -98,6 +98,8 @@ proc test_fields {lang} {
     gdb_py_test_silent_cmd "print (st)" "print value (st)" 1
     gdb_py_test_silent_cmd "python st = gdb.history (0)" "get value (st) from history" 1
     gdb_py_test_silent_cmd "python fields = st.type.fields()" "get fields from st.type" 1
+    gdb_test "python print (st.type.objfile.filename == gdb.current_progspace ().filename)" "True" \
+      "check type.objfile"
     gdb_test "python print (len(fields))" "2" "check number of fields (st)"
     gdb_test "python print (fields\[0\].name)" "a" "check structure field a name"
     gdb_test "python print (fields\[1\].name)" "b" "check structure field b name"
@@ -269,6 +271,8 @@ if { [build_inferior "${binfile}" "c"] == 0 } {
   # Skip all tests if Python scripting is not enabled.
   if { [skip_python_tests] } { continue }
 
+  gdb_test "python print (gdb.lookup_type ('char').objfile)" "None"
+
   gdb_test "python print(gdb.lookup_type('char').array(1, 0))" \
       "char \\\[0\\\]"