diff options
| author | jkratoch <jkratoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-20 19:00:51 +0000 |
|---|---|---|
| committer | jkratoch <jkratoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-20 19:00:51 +0000 |
| commit | 073ddf1b1673ccc51d5278ff8c90a75706430311 (patch) | |
| tree | 503821057663083e83da3da89562fe800d770075 /libstdc++-v3/python | |
| parent | 10efd28562ef32ea7178c61b107f1785a560ecd1 (diff) | |
| download | gcc-073ddf1b1673ccc51d5278ff8c90a75706430311.tar.gz | |
PR libstdc++/68448
* python/hook.in: Call register_libstdcxx_printers.
* python/libstdcxx/v6/__init__.py: Wrap it to
register_libstdcxx_printers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230669 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/python')
| -rw-r--r-- | libstdc++-v3/python/hook.in | 5 | ||||
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/__init__.py | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in index 07fe4c62417..703b6a74488 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 de3aa728ceb..d8e060c809d 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) |