Bug 30827 - [gdb/symtab, dwarf4-gdb-index] FAIL: gdb.ada/same_enum.exp: print red
Summary: [gdb/symtab, dwarf4-gdb-index] FAIL: gdb.ada/same_enum.exp: print red
Status: RESOLVED FIXED
Alias: None
Product: gdb
Classification: Unclassified
Component: symtab (show other bugs)
Version: HEAD
: P2 normal
Target Milestone: 14.1
Assignee: Not yet assigned to anyone
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-09-06 15:23 UTC by Tom de Vries
Modified: 2023-09-07 20:00 UTC (History)
0 users

See Also:
Host:
Target:
Build:
Last reconfirmed:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Tom de Vries 2023-09-06 15:23:04 UTC
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
...

Minimal reproducer:
...
$ gdb -q -batch outputs/gdb.ada/same_enum/a -ex "print red"
No definition of "red" in current context.
...

After adding -readnow, it passes:
...
$ gdb -readnow -q -batch outputs/gdb.ada/same_enum/a -ex "print red"
$1 = red
...
so this looks like an index-related problem.
Comment 1 Tom de Vries 2023-09-07 06:57:27 UTC
This fixes it:
...
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index e178bb067a9..72848dfc26b 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -1205,12 +1205,11 @@ write_gdbindex (dwarf2_per_bfd *per_bfd, cooked_index *table,
      all_units, but only in their own hash table.  */
 
   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;
+      int &this_counter = counter;
 
       const auto insertpair = cu_index_htab.emplace (per_cu, this_counter);
       gdb_assert (insertpair.second);
...
Comment 2 Tom de Vries 2023-09-07 07:24:07 UTC
Regression since commit 844a72efbce ("Simplify gdb_index writing"), so this is broken in gdb 12 and 13.
Comment 4 Sourceware Commits 2023-09-07 19:59:41 UTC
The master branch has been updated by Tom de Vries <vries@sourceware.org>:

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
Comment 5 Tom de Vries 2023-09-07 20:00:11 UTC
Fixed.