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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8ba7efa38789b5e997510076a577425fb17e3aa2..58b2522449c2bfea8694d51844d5ae76ef6acc20 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-16  Jonathan Wakely  <jwakely@redhat.com>
+
+       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  <ville.voutilainen@gmail.com>
 
        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 36dd81dd8c8969fa6bb39df35edd5b8397cc5ea2..14025dda2a1b76782a1d5de4a12f7cb0852d73b8 100644 (file)
--- 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: