Re: [PATCH 2/9] gdb: factor out regexp compilation from global_symbol_searcher::search

[Simon Marchi <simark@simark.ca>]

On 2026-09-30 08:10, Rohr, Stephan wrote:
>> @@ -4854,14 +4855,15 @@
>> global_symbol_searcher::add_matching_symbols
>>  	      if (!sym->matches (domain))
>>  		continue;
>>
>> -	      if (preg.has_value () && preg->exec (sym->natural_name (), 0,
>> -						   nullptr, 0) != 0)
>> +	      if (name_regex.has_value ()
>> +		  && name_regex->exec (sym->natural_name (), 0,
>> +				       nullptr, 0) != 0)
>>  		continue;
>>
>>  	      if (((sym->domain () == VAR_DOMAIN
>>  		    || sym->domain () == FUNCTION_DOMAIN)
>> -		   && treg.has_value ()
>> -		   && !treg_matches_sym_type_name (*treg, sym)))
>> +		   && type_regex.has_value ()
>> +		   && !treg_matches_sym_type_name (*type_regex, sym)))
> 
> Should we also rename " treg_matches_sym_type_name" as part of this
> refactoring?   Also, the debug prints from " treg_matches_sym_type_name".

You're right, I'll rename to regex_matches_sym_type_name.

We can remove the function name from the debug print, since the debug
print macro already includes the function name.

Since I found more preg/treg to rename in stack.c, I'll move the
renaming part of this change to its own patch.  This patch will focus on
factoring out the regex compilation code.

>> diff --git a/gdb/symtab.h b/gdb/symtab.h
>> index a35449fbeeda..1675b126b19d 100644
>> --- a/gdb/symtab.h
>> +++ b/gdb/symtab.h
>> @@ -2669,31 +2669,38 @@ class global_symbol_searcher
>>       of SIZE_MAX, there is no "unlimited".  */
>>    size_t m_max_search_results = SIZE_MAX;
>>
>> -  /* Expand symtabs in OBJFILE that match PREG, are of type M_KIND.  Return
>> -     true if any msymbols were seen that we should later consider adding to
>> -     the results list.  */
>> -  bool expand_symtabs (objfile *objfile,
>> -		       const std::optional<compiled_regex> &preg) const;
>> +  /* Compile M_SYMBOL_NAME_REGEXP, if set.  */
> 
> The "compile_name_regex" method also corrects spaces for the parser.
> I think we could mention this in the comment.

Ok, will use:

  /* Compile M_SYMBOL_NAME_REGEXP, if set.

     This function normalizes the spacing when it detects a C++ operator in the
     regexp.  */
  std::optional<compiled_regex> compile_name_regex () const;

Simon