Re: [PATCH v2 3/5] [gdb/symtab] Detect overlapping ranges in create_addrmap_from_gdb_index

[Simon Marchi <simark@simark.ca>]

On 8/21/25 9:31 AM, Tom de Vries wrote:
> In create_addrmap_from_gdb_index, use the return value of
> addrmap_mutable::insert_empty to detect overlapping ranges.
> 
> Tested on x86_64-linux.
> ---
>  gdb/dwarf2/read-gdb-index.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c
> index 7db2834f4d3..79d19a3abaa 100644
> --- a/gdb/dwarf2/read-gdb-index.c
> +++ b/gdb/dwarf2/read-gdb-index.c
> @@ -1434,7 +1434,15 @@ create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile,
>  	  return false;
>  	}
>  
> -      mutable_map.set_empty (lo, hi - 1, index->units[cu_index]);
> +      bool full_range_p
> +	= mutable_map.set_empty (lo, hi - 1, index->units[cu_index]);
> +      if (!full_range_p)
> +	{
> +	  complaint (_(".gdb_index address table has a range (%s - %s) that"
> +		       " overlaps with an earlier range"),
> +		     hex_string (lo), hex_string (hi));
> +	  return false;
> +	}
>      }
>  
>    index->index_addrmap
> -- 
> 2.43.0
> 

LGTM.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

Simon