public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r8-10720] libstdc++: Fix std::any pretty printer [PR 68735]
@ 2021-01-11 17:44 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-01-11 17:44 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:2204b4121fa9cddb89dd52a8a0754a1ae0666efb
commit r8-10720-g2204b4121fa9cddb89dd52a8a0754a1ae0666efb
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Dec 2 21:39:08 2020 +0000
libstdc++: Fix std::any pretty printer [PR 68735]
This fixes errors seen on powerpc64 (big endian only) due to the
printers for std::any and std::experimental::any being unable to find
the manager function.
libstdc++-v3/ChangeLog:
PR libstdc++/65480
PR libstdc++/68735
* python/libstdcxx/v6/printers.py (function_pointer_to_name):
New helper function to get the name of a function from its
address.
(StdExpAnyPrinter.__init__): Use it.
(cherry picked from commit dc2b372ed1b1e9af6db45051cff95478c7616807)
Diff:
---
libstdc++-v3/python/libstdcxx/v6/printers.py | 29 +++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 69d5835e0c2..a476561b32e 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -1039,6 +1039,29 @@ class SingleObjContainerPrinter(object):
return self.visualizer.display_hint ()
return self.hint
+def function_pointer_to_name(f):
+ "Find the name of the function referred to by the gdb.Value f, "
+ " which should contain a function pointer from the program."
+
+ # Turn the function pointer into an actual address.
+ # This is needed to unpack ppc64 function descriptors.
+ f = f.dereference().address
+
+ if sys.version_info[0] == 2:
+ # Older versions of GDB need to use long for Python 2,
+ # because int(f) on 64-bit big-endian values raises a
+ # gdb.error saying "Cannot convert value to int."
+ f = long(f)
+ else:
+ f = int(f)
+
+ try:
+ # If the function can't be found older versions of GDB raise a
+ # RuntimeError saying "Cannot locate object file for block."
+ return gdb.block_for_pc(f).function.name
+ except:
+ return None
+
class StdExpAnyPrinter(SingleObjContainerPrinter):
"Print a std::any or std::experimental::any"
@@ -1051,11 +1074,11 @@ class StdExpAnyPrinter(SingleObjContainerPrinter):
visualizer = None
mgr = self.val['_M_manager']
if mgr != 0:
- func = gdb.block_for_pc(int(mgr.cast(gdb.lookup_type('intptr_t'))))
+ func = function_pointer_to_name(mgr)
if not func:
- raise ValueError("Invalid function pointer in %s" % self.typename)
+ raise ValueError("Invalid function pointer in %s" % (self.typename))
rx = r"""({0}::_Manager_\w+<.*>)::_S_manage""".format(typename)
- m = re.match(rx, func.function.name)
+ m = re.match(rx, func)
if not m:
raise ValueError("Unknown manager function in %s" % self.typename)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-11 17:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 17:44 [gcc r8-10720] libstdc++: Fix std::any pretty printer [PR 68735] Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).