FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: use make_scoped_restore to restore gdbpy_current_objfile

Browse source 
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.
This commit is contained in:
Andrew Burgess 2021-03-12 11:07:19 +00:00
parent e838b3ca21
commit ba6a0ef349
9 changed files with 264 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gdb/python/python.c
View file

@ -1388,11 +1388,10 @@ gdbpy_source_objfile_script (const struct extension_language_defn *extlang,
return;
gdbpy_enter enter_py (objfile->arch (), current_language);
gdbpy_current_objfile = objfile;
scoped_restore restire_current_objfile
= make_scoped_restore (&gdbpy_current_objfile, objfile);
python_run_simple_file (file, filename);
gdbpy_current_objfile = NULL;
}
/* Set the current objfile to OBJFILE and then execute SCRIPT
@ -1410,11 +1409,10 @@ gdbpy_execute_objfile_script (const struct extension_language_defn *extlang,
return;
gdbpy_enter enter_py (objfile->arch (), current_language);
gdbpy_current_objfile = objfile;
scoped_restore restire_current_objfile
= make_scoped_restore (&gdbpy_current_objfile, objfile);
PyRun_SimpleString (script);
gdbpy_current_objfile = NULL;
}
/* Return the current Objfile, or None if there isn't one. */