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

* valops.c (find_overload_match): Call do_cleanups before early

Browse source 
return.
	* top.c (execute_command): Call do_cleanups before early return.
	(command_loop): Likewise.
	* stack.c (backtrace_command): Make a null cleanup early.  Don't
	conditionally call do_cleanups.
	* python/py-value.c (TRY_CATCH): Move cleanup handling into
	TRY_CATCH.
	* python/py-breakpoint.c (gdbpy_breakpoint_has_py_cond): Rearrange
	so cleanups are always run.
	* mi/mi-cmd-var.c (mi_cmd_var_delete): Reset old_cleanups.
	* findcmd.c (parse_find_args): Call do_cleanups on early return
	path.
	* dbxread.c (elfstab_build_psymtabs): Make a null cleanup early.
	Don't conditionally call do_cleanups.
	* cli/cli-script.c (execute_user_command): Initialize 'old_chain'
	later.
This commit is contained in:
Tom Tromey 2011-06-27 19:21:51 +00:00
parent 57eb9b5086
commit 5fe41fbfa2
10 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/python/py-breakpoint.c
View file

@ -771,10 +771,9 @@ gdbpy_breakpoint_has_py_cond (struct breakpoint_object *bp_obj)
get_current_arch ();
struct cleanup *cleanup = ensure_python_env (garch, current_language);
if (py_bp == NULL)
return 0;
if (py_bp != NULL)
has_func = PyObject_HasAttrString (py_bp, stop_func);
has_func = PyObject_HasAttrString (py_bp, stop_func);
do_cleanups (cleanup);
return has_func;

12
gdb/python/py-value.c
View file

@ -553,8 +553,6 @@ static PyObject *
valpy_str (PyObject *self)
{
char *s = NULL;
struct ui_file *stb;
struct cleanup *old_chain;
PyObject *result;
struct value_print_options opts;
volatile struct gdb_exception except;
@ -562,19 +560,19 @@ valpy_str (PyObject *self)
get_user_print_options (&opts);
opts.deref_ref = 0;
stb = mem_fileopen ();
old_chain = make_cleanup_ui_file_delete (stb);
TRY_CATCH (except, RETURN_MASK_ALL)
{
struct ui_file *stb = mem_fileopen ();
struct cleanup *old_chain = make_cleanup_ui_file_delete (stb);
common_val_print (((value_object *) self)->value, stb, 0,
&opts, python_language);
s = ui_file_xstrdup (stb, NULL);
do_cleanups (old_chain);
}
GDB_PY_HANDLE_EXCEPTION (except);
do_cleanups (old_chain);
result = PyUnicode_Decode (s, strlen (s), host_charset (), NULL);
xfree (s);