From: Jonathan Wakely Date: Thu, 18 May 2017 15:31:07 +0000 (+0100) Subject: PR libstdc++/67440 make pretty printers work with GDB 7.6 again X-Git-Tag: releases/gcc-5.5.0~352 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9303f5a311d05d59958c4a343a78d76a26824f20;p=thirdparty%2Fgcc.git PR libstdc++/67440 make pretty printers work with GDB 7.6 again Backport from mainline 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. From-SVN: r248233 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 20ceee4b52f1..439069f8091a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2017-05-18 Jonathan Wakely + Backport from mainline + 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. + Backport from mainline 2017-01-17 Jonathan Wakely diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 63c807335474..babde0bc4a69 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: