PR libstdc++/67440 make pretty printers work with GDB 7.6 again

Backport from mainline
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.

From-SVN: r248233

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 20ceee4b52f117bde7c9f6f444adb12f406a92c9..439069f8091ad9afeafb14f885b96774b6403e6c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2017-05-18  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       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.
+
        Backport from mainline
        2017-01-17  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 63c807335474dabc9beb4f150f2ef60228cfcad2..babde0bc4a69dd231b66411512cbfb9596b66c81 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: