From 7acc5349773cfe101d6ed116be30e15eb71b0d0f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 16 Mar 2017 14:11:48 +0000 Subject: [PATCH] PR libstdc++/67440 make pretty printers work with GDB 7.6 again PR libstdc++/67440 * python/libstdcxx/v6/printers.py (find_type): Avoid gdb.Type.name for GDB 7.6 compatibility, use gdb.Type.unqualified instead. From-SVN: r246196 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8ba7efa3878..58b2522449c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-03-16 Jonathan Wakely + + PR libstdc++/67440 + * python/libstdcxx/v6/printers.py (find_type): Avoid gdb.Type.name + for GDB 7.6 compatibility, use gdb.Type.unqualified instead. + 2017-03-15 Ville Voutilainen Implement LWG 2857, {variant,optional,any}::emplace should diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 36dd81dd8c8..14025dda2a1 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -85,9 +85,8 @@ except ImportError: def find_type(orig, name): typ = orig.strip_typedefs() while True: - # Use typ.name here instead of str(typ) to discard any const,etc. - # qualifiers. PR 67440. - search = typ.name + '::' + name + # Strip cv-qualifiers. PR 67440. + search = '%s::%s' % (typ.unqualified(), name) try: return gdb.lookup_type(search) except RuntimeError: -- 2.30.2