Re: [PATCH 2/3] Change location_to_sals to a method

[Pedro Alves <pedro@palves.net>]

On 2022-05-28 03:42, Tom Tromey wrote:

>  
> @@ -12673,26 +12674,26 @@ location_to_sals (struct breakpoint *b, struct event_location *location,
>      {
>        for (auto &sal : sals)
>  	resolve_sal_pc (&sal);
> -      if (b->condition_not_parsed && b->extra_string != NULL)
> +      if (condition_not_parsed && extra_string != NULL)
>  	{
> -	  gdb::unique_xmalloc_ptr<char> cond_string, extra_string;
> +	  gdb::unique_xmalloc_ptr<char> local_cond, local_extra;
>  	  int thread, task;

These thread/task are masking the breakpoint fields, and then ...

>  
> -	  find_condition_and_thread_for_sals (sals, b->extra_string.get (),
> -					      &cond_string, &thread,
> -					      &task, &extra_string);
> -	  gdb_assert (b->cond_string == NULL);
> -	  if (cond_string)
> -	    b->cond_string = std::move (cond_string);
> -	  b->thread = thread;
> -	  b->task = task;
> -	  if (extra_string)
> -	    b->extra_string = std::move (extra_string);
> -	  b->condition_not_parsed = 0;
> +	  find_condition_and_thread_for_sals (sals, extra_string.get (),
> +					      &local_cond, &thread,
> +					      &task, &local_extra);
> +	  gdb_assert (cond_string == nullptr);
> +	  if (local_cond != nullptr)
> +	    cond_string = std::move (local_cond);
> +	  thread = thread;
> +	  task = task;

... here you end up with self assignments.