* python/py-type.c (typy_fields_items): Call check_typedef.

	testsuite/
	* gdb.python/py-type.c (TS): New typedef.
	(ts): New global.
	* gdb.python/py-type.exp: Test field list of typedef.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c1770be68e0200f6695f4330ed64a6937ad6c0c6..cc877485bfc4af012248720cbc21d5d4cc35c28c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-10  Doug Evans  <dje@google.com>
+
+       * python/py-type.c (typy_fields_items): Call check_typedef.
+
 2011-11-10  Joel Brobecker  <brobecker@adacore.com>
 
        * findvar.c (read_frame_register_value): Read the correct bytes

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 67696fd80a7bbbcbdb61e0874189405d351b8157..44a22232827bc55ae7b0b75f392ef096cc66e32c 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -294,14 +294,33 @@ make_fielditem (struct type *type, int i, enum gdbpy_iter_kind kind)
 static PyObject *
 typy_fields_items (PyObject *self, enum gdbpy_iter_kind kind)
 {
+  PyObject *py_type = self;
   PyObject *result = NULL, *iter = NULL;
-  
-  iter = typy_make_iter (self, kind);
-  if (iter == NULL)
-    return NULL;
-    
-  result = PySequence_List (iter);
-  Py_DECREF (iter);
+  volatile struct gdb_exception except;
+  struct type *type = ((type_object *) py_type)->type;
+  struct type *checked_type = type;
+
+  TRY_CATCH (except, RETURN_MASK_ALL)
+    {
+      CHECK_TYPEDEF (checked_type);
+    }
+  GDB_PY_HANDLE_EXCEPTION (except);
+
+  if (checked_type != type)
+    py_type = type_to_type_object (checked_type);
+  iter = typy_make_iter (py_type, kind);
+  if (checked_type != type)
+    {
+      /* Need to wrap this in braces because Py_DECREF isn't wrapped
+        in a do{}while(0).  */
+      Py_DECREF (py_type);
+    }
+  if (iter != NULL)
+    {
+      result = PySequence_List (iter);
+      Py_DECREF (iter);
+    }
+
   return result;
 }
 

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8b0abc333254f652cc690c88cf7d193e35f76f75..a12be84399a1fc8aa48560b8e54a1c3c90a377d0 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-10  Doug Evans  <dje@google.com>
+
+       * gdb.python/py-type.c (TS): New typedef.
+       (ts): New global.
+       * gdb.python/py-type.exp: Test field list of typedef.
+
 2011-11-10  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.ada/small_reg_param: New testcase.

diff --git a/gdb/testsuite/gdb.python/py-type.c b/gdb/testsuite/gdb.python/py-type.c
index b0dcc9dc8fd50801376a53ef70c34772b3db5557..2d49ff822fc20ad4009228c1d15d8ef3e8420592 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.c
+++ b/gdb/testsuite/gdb.python/py-type.c
@@ -21,6 +21,9 @@ struct s
   int b;
 };
 
+typedef struct s TS;
+TS ts;
+
 #ifdef __cplusplus
 struct C
 {

diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index ec86586f0af9cfd260939b99a601d986487c7152..3578a7e226735ef7d99c1e8bac17e65d1b6430eb 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -64,6 +64,10 @@ proc runto_bp {bp} {
 proc test_fields {lang} {
   global gdb_prompt
 
+  # .fields() of a typedef should still return the underlying field list
+  gdb_test "python print len(gdb.parse_and_eval('ts').type.fields())" "2" \
+      "$lang typedef field list"
+
   if {$lang == "c++"} {
       # Test usage with a class
       gdb_py_test_silent_cmd "print c" "print value" 1