From b146b57a9de529c5f7c55dff0842f01872b40fb0 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 20 Nov 2015 19:10:12 +0000 Subject: [PATCH] re PR libstdc++/68448 (Python Pretty Printers get disabled on libstdc++ reload by GDB) PR libstdc++/68448 * python/hook.in: Call register_libstdcxx_printers. * python/libstdcxx/v6/__init__.py: Wrap it to register_libstdcxx_printers. From-SVN: r230670 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/python/hook.in | 5 ++++- libstdc++-v3/python/libstdcxx/v6/__init__.py | 15 ++++++++------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6d1bffe41655..4f1462c5a47b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-11-20 Jan Kratochvil + + PR libstdc++/68448 + * python/hook.in: Call register_libstdcxx_printers. + * python/libstdcxx/v6/__init__.py: Wrap it to + register_libstdcxx_printers. + 2015-11-16 Doug Evans PR libstdc++/67440 diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in index 07fe4c624171..703b6a744886 100644 --- a/libstdc++-v3/python/hook.in +++ b/libstdc++-v3/python/hook.in @@ -55,4 +55,7 @@ if gdb.current_objfile () is not None: if not dir_ in sys.path: sys.path.insert(0, dir_) -import libstdcxx.v6 +# Call a function as a plain import would not execute body of the included file +# on repeated reloads of this object file. +from libstdcxx.v6 import register_libstdcxx_printers +register_libstdcxx_printers(gdb.current_objfile()) diff --git a/libstdc++-v3/python/libstdcxx/v6/__init__.py b/libstdc++-v3/python/libstdcxx/v6/__init__.py index de3aa728cebb..d8e060c809d9 100644 --- a/libstdc++-v3/python/libstdcxx/v6/__init__.py +++ b/libstdc++-v3/python/libstdcxx/v6/__init__.py @@ -15,10 +15,6 @@ import gdb -# Load the pretty-printers. -from .printers import register_libstdcxx_printers -register_libstdcxx_printers(gdb.current_objfile()) - # Load the xmethods if GDB supports them. def gdb_has_xmethods(): try: @@ -27,6 +23,11 @@ def gdb_has_xmethods(): except ImportError: return False -if gdb_has_xmethods(): - from .xmethods import register_libstdcxx_xmethods - register_libstdcxx_xmethods(gdb.current_objfile()) +def register_libstdcxx_printers(obj): + # Load the pretty-printers. + from .printers import register_libstdcxx_printers + register_libstdcxx_printers(obj) + + if gdb_has_xmethods(): + from .xmethods import register_libstdcxx_xmethods + register_libstdcxx_xmethods(obj)