[binutils-gdb] [gdb/symtab] Fix gdb-index writing for .debug_types

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=be7d5d2c417a842452f5f5d4ed7fc8d058a970bf

commit be7d5d2c417a842452f5f5d4ed7fc8d058a970bf
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Sep 7 21:59:33 2023 +0200

    [gdb/symtab] Fix gdb-index writing for .debug_types
    
    With test-case gdb.ada/same_enum.exp and target board dwarf4-gdb-index we run
    into:
    ...
    (gdb) print red^M
    No definition of "red" in current context.^M
    (gdb) FAIL: gdb.ada/same_enum.exp: print red
    ...
    
    [ This is a regression since commit 844a72efbce ("Simplify gdb_index writing"),
    so this is broken in gdb 12 and 13. ]
    
    The easiest way to see what's going wrong is with readelf.  We have in section
    .gdb_index:
    ...
    [7194] pck__red:
            2 [static, variable]
            3 [static, variable]
    ...
    which points to the CUs 2 and 3 in the CU list (shown using "2" and "3"), but
    should be pointing to the TUs 2 and 3 in the TU list (shown using "T2" and
    "T3").
    
    Fix this by removing the counter / types_counter distinction in
    write_gdbindex, such that we get the expected:
    ...
    [7194] pck__red:
            T2 [static, variable]
            T3 [static, variable]
    ...
    
    [ While reading write_gdbindex I noticed a few oddities related to dwz
    handling, I've filed PR30829 about this. ]
    
    Tested on x86_64-linux.
    
    Approved-By: Tom Tromey <tom@tromey.com>
    
    PR symtab/30827
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30827

Diff:
---
 gdb/dwarf2/index-write.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index e178bb067a9..11f254e263a 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -1201,18 +1201,14 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table,
   data_buf types_cu_list;
 
   /* The CU list is already sorted, so we don't need to do additional
-     work here.  Also, the debug_types entries do not appear in
-     all_units, but only in their own hash table.  */
+     work here.  */
 
   int counter = 0;
-  int types_counter = 0;
   for (int i = 0; i < per_bfd->all_units.size (); ++i)
     {
       dwarf2_per_cu_data *per_cu = per_bfd->all_units[i].get ();
 
-      int &this_counter = per_cu->is_debug_types ? types_counter : counter;
-
-      const auto insertpair = cu_index_htab.emplace (per_cu, this_counter);
+      const auto insertpair = cu_index_htab.emplace (per_cu, counter);
       gdb_assert (insertpair.second);
 
       /* The all_units list contains CUs read from the objfile as well as
@@ -1234,7 +1230,7 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table,
       else
 	cu_list.append_uint (8, BFD_ENDIAN_LITTLE, per_cu->length ());
 
-      ++this_counter;
+      ++counter;
     }
 
   write_cooked_index (table, cu_index_htab, &symtab);