From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 436113851400 for ; Wed, 12 Oct 2022 15:08:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 436113851400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 758EA1F461 for ; Wed, 12 Oct 2022 15:08:38 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 569A613ACD for ; Wed, 12 Oct 2022 15:08:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dm6yE3bYRmP+NgAAMHmgww (envelope-from ) for ; Wed, 12 Oct 2022 15:08:38 +0000 Message-ID: <87e88f47-94d6-0453-b4af-11c11a684597@suse.de> Date: Wed, 12 Oct 2022 17:08:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: [commited][PATCH 1/3] [gdb/symtab] Factor out elf_symfile_read_dwarf2 Content-Language: en-US To: gdb-patches@sourceware.org References: <20220922152042.21914-1-tdevries@suse.de> From: Tom de Vries In-Reply-To: <20220922152042.21914-1-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2022 15:09:02 -0000 On 9/22/22 17:20, Tom de Vries via Gdb-patches wrote: > Factor out elf_symfile_read_dwarf2 from elf_symfile_read. NFC. > > Tested on x86_64-linux. Committed. Thanks, - Tom > --- > gdb/elfread.c | 142 +++++++++++++++++++++++++++----------------------- > 1 file changed, 78 insertions(+), 64 deletions(-) > > diff --git a/gdb/elfread.c b/gdb/elfread.c > index 8aee634b44b..ed11c67dc02 100644 > --- a/gdb/elfread.c > +++ b/gdb/elfread.c > @@ -1166,6 +1166,83 @@ elf_read_minimal_symbols (struct objfile *objfile, int symfile_flags, > symtab_create_debug_printf ("done reading minimal symbols"); > } > > +/* Dwarf-specific helper for elf_symfile_read. Return true if we managed to > + load dwarf debug info. */ > + > +static bool > +elf_symfile_read_dwarf2 (struct objfile *objfile, > + symfile_add_flags symfile_flags) > +{ > + bool has_dwarf2 = true; > + > + if (dwarf2_has_info (objfile, NULL, true)) > + dwarf2_initialize_objfile (objfile); > + /* If the file has its own symbol tables it has no separate debug > + info. `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to > + SYMTABS/PSYMTABS. `.gnu_debuglink' may no longer be present with > + `.note.gnu.build-id'. > + > + .gnu_debugdata is !objfile::has_partial_symbols because it contains only > + .symtab, not .debug_* section. But if we already added .gnu_debugdata as > + an objfile via find_separate_debug_file_in_section there was no separate > + debug info available. Therefore do not attempt to search for another one, > + objfile->separate_debug_objfile->separate_debug_objfile GDB guarantees to > + be NULL and we would possibly violate it. */ > + > + else if (!objfile->has_partial_symbols () > + && objfile->separate_debug_objfile == NULL > + && objfile->separate_debug_objfile_backlink == NULL) > + { > + std::string debugfile = find_separate_debug_file_by_buildid (objfile); > + > + if (debugfile.empty ()) > + debugfile = find_separate_debug_file_by_debuglink (objfile); > + > + if (!debugfile.empty ()) > + { > + gdb_bfd_ref_ptr debug_bfd (symfile_bfd_open (debugfile.c_str ())); > + > + symbol_file_add_separate (debug_bfd, debugfile.c_str (), > + symfile_flags, objfile); > + } > + else > + { > + has_dwarf2 = false; > + const struct bfd_build_id *build_id > + = build_id_bfd_get (objfile->obfd.get ()); > + const char *filename = bfd_get_filename (objfile->obfd.get ()); > + > + if (build_id != nullptr) > + { > + gdb::unique_xmalloc_ptr symfile_path; > + scoped_fd fd (debuginfod_debuginfo_query (build_id->data, > + build_id->size, > + filename, > + &symfile_path)); > + > + if (fd.get () >= 0) > + { > + /* File successfully retrieved from server. */ > + gdb_bfd_ref_ptr debug_bfd (symfile_bfd_open (symfile_path.get ())); > + > + if (debug_bfd == nullptr) > + warning (_("File \"%s\" from debuginfod cannot be opened as bfd"), > + filename); > + else if (build_id_verify (debug_bfd.get (), build_id->size, > + build_id->data)) > + { > + symbol_file_add_separate (debug_bfd, symfile_path.get (), > + symfile_flags, objfile); > + has_dwarf2 = true; > + } > + } > + } > + } > + } > + > + return has_dwarf2; > +} > + > /* Scan and build partial symbols for a symbol file. > We have been initialized by a call to elf_symfile_init, which > currently does nothing. > @@ -1195,7 +1272,6 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) > { > bfd *abfd = objfile->obfd.get (); > struct elfinfo ei; > - bool has_dwarf2 = true; > > memset ((char *) &ei, 0, sizeof (ei)); > if (!(objfile->flags & OBJF_READNEVER)) > @@ -1244,69 +1320,7 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) > bfd_section_size (str_sect)); > } > > - if (dwarf2_has_info (objfile, NULL, true)) > - dwarf2_initialize_objfile (objfile); > - /* If the file has its own symbol tables it has no separate debug > - info. `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to > - SYMTABS/PSYMTABS. `.gnu_debuglink' may no longer be present with > - `.note.gnu.build-id'. > - > - .gnu_debugdata is !objfile::has_partial_symbols because it contains only > - .symtab, not .debug_* section. But if we already added .gnu_debugdata as > - an objfile via find_separate_debug_file_in_section there was no separate > - debug info available. Therefore do not attempt to search for another one, > - objfile->separate_debug_objfile->separate_debug_objfile GDB guarantees to > - be NULL and we would possibly violate it. */ > - > - else if (!objfile->has_partial_symbols () > - && objfile->separate_debug_objfile == NULL > - && objfile->separate_debug_objfile_backlink == NULL) > - { > - std::string debugfile = find_separate_debug_file_by_buildid (objfile); > - > - if (debugfile.empty ()) > - debugfile = find_separate_debug_file_by_debuglink (objfile); > - > - if (!debugfile.empty ()) > - { > - gdb_bfd_ref_ptr debug_bfd (symfile_bfd_open (debugfile.c_str ())); > - > - symbol_file_add_separate (debug_bfd, debugfile.c_str (), > - symfile_flags, objfile); > - } > - else > - { > - has_dwarf2 = false; > - const struct bfd_build_id *build_id > - = build_id_bfd_get (objfile->obfd.get ()); > - const char *filename = bfd_get_filename (objfile->obfd.get ()); > - > - if (build_id != nullptr) > - { > - gdb::unique_xmalloc_ptr symfile_path; > - scoped_fd fd (debuginfod_debuginfo_query (build_id->data, > - build_id->size, > - filename, > - &symfile_path)); > - > - if (fd.get () >= 0) > - { > - /* File successfully retrieved from server. */ > - gdb_bfd_ref_ptr debug_bfd (symfile_bfd_open (symfile_path.get ())); > - > - if (debug_bfd == nullptr) > - warning (_("File \"%s\" from debuginfod cannot be opened as bfd"), > - filename); > - else if (build_id_verify (debug_bfd.get (), build_id->size, build_id->data)) > - { > - symbol_file_add_separate (debug_bfd, symfile_path.get (), > - symfile_flags, objfile); > - has_dwarf2 = true; > - } > - } > - } > - } > - } > + bool has_dwarf2 = elf_symfile_read_dwarf2 (objfile, symfile_flags); > > /* Read the CTF section only if there is no DWARF info. */ > if (!has_dwarf2 && ei.ctfsect) > > base-commit: aaf3f3f3bb38a59125ea34afa0ef7e0e14c2e916