Re: [PATCH][gdb] Make execute_command_to_string return string on throw

[Simon Marchi <simark@simark.ca>]

On 2021-10-07 12:15 p.m., Tom de Vries via Gdb-patches wrote:
> On 10/7/21 5:33 PM, Simon Marchi wrote:
>>> --- a/gdb/top.c
>>> +++ b/gdb/top.c
>>> @@ -728,13 +728,22 @@ execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn)
>>>
>>>  /* See gdbcmd.h.  */
>>>
>>> -std::string
>>> -execute_fn_to_string (std::function<void(void)> fn, bool term_out)
>>> +void
>>> +execute_fn_to_string (std::string &res, std::function<void(void)> fn,
>>> +		      bool term_out)
>>>  {
>>>    string_file str_file (term_out);
>>>
>>> -  execute_fn_to_ui_file (&str_file, fn);
>>> -  return std::move (str_file.string ());
>>> +  try {
>>> +    execute_fn_to_ui_file (&str_file, fn);
>>> +  } catch (...) {
>>> +    /* Finally.  */
>>> +    res = std::move (str_file.string ());
>>> +    throw;
>>> +  }
>>
>> Formatting.
>>
> 
> Ack, fixed.
> 
>> The code LGTM, but could you write / update a test for this?
> 
> The patch "[gdb/testsuite] Reimplement gdb.gdb/python-interrupts.exp as
> unittest" uses this.  It checks the output of a command that is also
> throwing a "Error while executing Python code".
> 
> Thanks,
> - Tom
> 


Ok, that's fine with me.

Simon