diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-03-12 11:07:19 +0000 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-03-15 09:21:37 +0000 |
| commit | ba6a0ef34933712ec65855997e982bead3b314d4 (patch) | |
| tree | 3e2266ac864cec209509e064b85c6a4dec9dd204 /gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py | |
| parent | e838b3ca2172f275e05b098adf48a36bda6348b3 (diff) | |
| download | binutils-ba6a0ef34933712ec65855997e982bead3b314d4.zip binutils-ba6a0ef34933712ec65855997e982bead3b314d4.tar.gz binutils-ba6a0ef34933712ec65855997e982bead3b314d4.tar.bz2 | |
gdb: use make_scoped_restore to restore gdbpy_current_objfile
The current mechanism by which the Python gdb.current_objfile is
maintained does not allow for nested auto-load events. It is assumed
that once an auto-load script has finished loading then the current
objfile should be set back to NULL. In a nested situation, we should
be restoring the previous value.
We already have an RAII class to handle save/restore type behaviour,
so lets just switch to use that.
The test is a little contrived, but is simple enough, and triggers the
bug. The real use case might involve the auto-load script calling
functions (either in the just-loaded object file, or in the main
executable), which in turn trigger further auto-loads to occur.
gdb/ChangeLog:
* python/python.c (gdbpy_source_objfile_script): Use
make_scoped_restore to restore gdbpy_current_objfile.
(gdbpy_execute_objfile_script): Likewise.
gdb/testsuite/ChangeLog:
* gdb.python/py-auto-load-chaining-f1.c: New file.
* gdb.python/py-auto-load-chaining-f1.o-gdb.py: New file.
* gdb.python/py-auto-load-chaining-f2.c: New file.
* gdb.python/py-auto-load-chaining-f2.o-gdb.py: New file.
* gdb.python/py-auto-load-chaining.c: New file.
* gdb.python/py-auto-load-chaining.exp: New file.
Diffstat (limited to 'gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py')
| -rw-r--r-- | gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py b/gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py new file mode 100644 index 0000000..f5c29cd --- /dev/null +++ b/gdb/testsuite/gdb.python/py-auto-load-chaining-f2.o-gdb.py @@ -0,0 +1,24 @@ +# Copyright (C) 2021 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# This script is auto-loaded when the py-auto-load-chaining-f2.o +# object is loaded. + +print ("Entering f2.o auto-load script") + +print ("Current objfile is: %s" + % gdb.current_objfile ().filename) + +print ("Leaving f2.o auto-load script") |