From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id AD8583857023; Mon, 12 Sep 2022 08:05:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD8583857023 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662969934; bh=ltXFGnr/VotFe638vooSKAVfwV0421NP8wsNP6uEb+Q=; h=From:To:Subject:Date:From; b=wtODJa2AcqPKCG/AbqLWk2slXwyOZfbczp0VA4JUjvlBYcDoiR+Ta7zupQXvhKqeC f0/vxtcto2W9UM/ds1wsykoGdB7dR3HI73V7ufenlOh+0AbNKLJUxz5C1soNUTeKgU f8EBYkmoRnWGnhtdU6V2t96hr95HZ3CnbFrcwni4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/symtab] Support .gdb_index section with TUs in .debug_info X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 52b920c5d2098a7319bcae3f31c0d1fb58d40c38 X-Git-Newrev: abe47e91d8c4b40429bc5834f8a91c25b10172ca Message-Id: <20220912080534.AD8583857023@sourceware.org> Date: Mon, 12 Sep 2022 08:05:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dabe47e91d8c4= b40429bc5834f8a91c25b10172ca commit abe47e91d8c4b40429bc5834f8a91c25b10172ca Author: Tom de Vries Date: Mon Sep 12 10:05:18 2022 +0200 [gdb/symtab] Support .gdb_index section with TUs in .debug_info =20 The .gdb_index variant of commit d878bb39e41 ("[gdb/symtab] Support .debug_names section with TUs in .debug_info"). =20 Tested on x86_64-linux. Diff: --- gdb/dwarf2/read.c | 7 ++-- gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.c | 29 +++++++++++++++ .../gdb.dwarf2/gdb-index-types-dwarf5.exp | 41 ++++++++++++++++++= ++++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index da99402cff0..29ccd00a1da 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2707,13 +2707,16 @@ dwarf2_read_gdb_index { /* We can only handle a single .debug_types when we have an index. */ - if (per_bfd->types.size () !=3D 1) + if (per_bfd->types.size () > 1) { per_bfd->all_comp_units.clear (); return 0; } =20 - dwarf2_section_info *section =3D &per_bfd->types[0]; + dwarf2_section_info *section + =3D (per_bfd->types.size () =3D=3D 1 + ? &per_bfd->types[0] + : &per_bfd->info); =20 create_signatured_type_table_from_index (per_bfd, section, types_lis= t, types_list_elements); diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.c b/gdb/testsu= ite/gdb.dwarf2/gdb-index-types-dwarf5.c new file mode 100644 index 00000000000..f568c82917e --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.c @@ -0,0 +1,29 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2022 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + . */ + +struct struct_with_int_member { + int member; +}; + +struct struct_with_int_member var; + +int +main (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp b/gdb/test= suite/gdb.dwarf2/gdb-index-types-dwarf5.exp new file mode 100644 index 00000000000..27cadc523cd --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp @@ -0,0 +1,41 @@ +# Copyright 2022 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +standard_testfile + +set flags {} +lappend flags {additional_flags=3D-fdebug-types-section} +lappend flags {additional_flags=3D-gdwarf-5} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + $srcfile $flags] } { + return -1 +} + +require {ensure_gdb_index $binfile} =3D=3D 1 + +clean_restart ${binfile} + +# Verify that .gdb_index section is not ignored. +set index [have_index $binfile] +gdb_assert { [string equal $index "gdb_index"] } ".gdb_index used" + +# Verify that we can find the type in the type unit. +set re \ + [multi_line \ + "type =3D struct struct_with_int_member {" \ + " int member;" \ + "}"] +gdb_test "ptype struct struct_with_int_member" $re