From fbb1aacebac7d1fd556cf9c46e9af89aaaa62398 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 8 Feb 2021 21:24:52 +0000 Subject: gdb: fix field names of GDB's type main_type structure In commit: commit 5b7d941b90d1a232dc144dc14850dd2fb63c35da Date: Fri Jan 22 12:21:09 2021 -0500 gdb: add owner-related methods to struct type two fields of struct maint_type were renamed. 'flag_objfile_owned' became 'm_flag_objfile_owned' and 'owner' became 'm_owner'. Update our python helper script to take this into account. I've added a basic test that uses the self-test framework to load the pretty printers, and print a type. The test relies on stopping in GDB's `value_print` function. gdb/ChangeLog: * gdb-gdb.py.in (StructMainTypePrettyPrinter) : Updated fields names flag_objfile_owned to m_flag_objfile_owned, and owner to m_owner. gdb/testsuite/ChangeLog: * gdb.gdb/python-helper.exp: New file. --- gdb/gdb-gdb.py.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/gdb-gdb.py.in') diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index 2b1c7de..f58b307 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -142,10 +142,10 @@ class StructMainTypePrettyPrinter: def owner_to_string(self): """Return an image of component "owner". """ - if self.val['flag_objfile_owned'] != 0: - return "%s (objfile)" % self.val['owner']['objfile'] + if self.val['m_flag_objfile_owned'] != 0: + return "%s (objfile)" % self.val['m_owner']['objfile'] else: - return "%s (gdbarch)" % self.val['owner']['gdbarch'] + return "%s (gdbarch)" % self.val['m_owner']['gdbarch'] def struct_field_location_img(self, field_val): """Return an image of the loc component inside the given field -- cgit v1.1