From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D6C6838618BF for ; Wed, 8 Nov 2023 15:49:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6C6838618BF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D6C6838618BF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699458553; cv=none; b=bAH5ME2ZLFFpS1jolXg765QjPkcSHvtToVNuIlXu1LppIepPXxx6t7jmppaQwa7ylm+RZGVkTfnxMxUCOS1bemataUcpOSGx+FH5Eim2dWFC21Cbm3+eyn5Ziw0ajuSIcr6t+OhBfsbcmkPCG1MAdmTlp3e5doEMLrhqUUbgHFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699458553; c=relaxed/simple; bh=q7jvy0Oho1dfTLlJUl4+E/mZz5W7nSXoiZKi593SI+0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=m0SRygqCuJmglSbtOrilq4L0RwLPPhSd7t3G2L/CpyUEKyTfZhg3z9lhnxUwrv3C6II3uJwZ5W1VQTX9GLC7F5sbVjSqhz/YOxLniRULRSXTZ4AcNsWbWjDdIjKLVQBE3L+KQbaGCeOg1/5hJru697gT1LP5PXhRS5GWFl9ARag= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699458550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/Ab3yjFozmVUJiVMnZY8p/PORJECPk/dNhWo8FkyKw=; b=WFo3or4U+Y/u8zCVUAnf+bOXF72vRCcn9ktG2aCxdaJO6n2Pc6zBE6sSbJOvOQDxjWFCuX +bQb7F3afO6saKXUnXRK9+UE0Y+IdhVPcHueTx05k4VK1B4iI/f/Rte76A89TXTbu4CNv5 QLi5ri8X8sgoTTiTLOHCtZF8KGWDxFs= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-436-ZCyUY-uFO8iodJ2VGc98gQ-1; Wed, 08 Nov 2023 10:49:09 -0500 X-MC-Unique: ZCyUY-uFO8iodJ2VGc98gQ-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2c503804667so78993961fa.0 for ; Wed, 08 Nov 2023 07:49:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699458547; x=1700063347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WGXmeURbYVw9vUPfXW4Eraf/q9YlkecuCkw0386Dy68=; b=IC3RmHZrKABKxyaFa4SADUVdzi5LDjxJguoUZmxjefd8sRWEjPQSQ46E3Pc/2MAa6Y CfUqnmQ+cHhMIEgOAzJXxmaSCqRYMZYrsva0Ey9iW/WeciEupKiPmv4EWU4yGeWDNyjH jRIkECwPQwarhPag4TwLZ8nKKxUVsDDi8Qv6rfax49XRbQDuyXqa75ER+Cn1xw9UfuP7 h8Ww7TyXDwxFpVrPBlHROFOr9Ul2oO2rJBb8pyOXTXgUjuCkZePB+m60Br1NvLD4a6gV 8FIoOH4dIOPNW60zzVmOLTRMcp1u2oezLLUBQJucFJYbpIlpaQB4gtfZmTP2EGnvgwz7 lf5A== X-Gm-Message-State: AOJu0YxNA9rBtiJvbenqIf36OzuRemlq6wr01aKLddh4m69BzSbt+5qz vG9PtIryrySq771D7kxArGGbDTcBmiLkWWCFx9cIpjx6eC6chYZV36TNr2ShK8L6L0Cv+LDaagR tOPAlBdUFbp4wmBCy7TRsGCS2mhl73UiaAXiRWen/bTJ03rl/FLl0geKlnieumUU3YiHY4iZMJq W+ajyqew== X-Received: by 2002:a2e:3806:0:b0:2c5:94a:ac96 with SMTP id f6-20020a2e3806000000b002c5094aac96mr2250527lja.9.1699458547456; Wed, 08 Nov 2023 07:49:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPk23e6d+2NZw43MpEzuqm3m3xxc3/opcMoG0A7A7GDwg2fHOI3wQBOCZG/wxV8aMG1PB3TQ== X-Received: by 2002:a2e:3806:0:b0:2c5:94a:ac96 with SMTP id f6-20020a2e3806000000b002c5094aac96mr2250510lja.9.1699458547076; Wed, 08 Nov 2023 07:49:07 -0800 (PST) Received: from localhost (105.226.159.143.dyn.plus.net. [143.159.226.105]) by smtp.gmail.com with ESMTPSA id fj12-20020a05600c0c8c00b004094c5d92bdsm20290286wmb.31.2023.11.08.07.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 07:49:06 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess , Tom Tromey Subject: [PATCHv2 2/5] gdb: merge debug symbol file lookup code from coffread & elfread paths Date: Wed, 8 Nov 2023 15:48:56 +0000 Message-Id: <9872e349b990347597086865520991dbb023feaa.1699458402.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_INVALID,DKIM_SIGNED,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This commit merges the code that looks for and loads the separate debug symbol files from coffread.c and elfread.c. The factored out code is moved into a new objfile::find_and_add_separate_symbol_file() method. For the elfread.c path there should be no user visible changes after this commit. For the coffread.c path GDB will now attempt to perform a debuginfod lookup for the missing debug information, assuming that GDB can find a build-id in the COFF file. I don't know if COFF files can include a build-id, but I the existing coffread.c code already includes a call to find_separate_debug_file_by_build-id, so I know that it is at least OK for GDB to ask a COFF file for a build-id. If the COFF file doesn't include a build-id then the debuginfod lookup code will not trigger and the new code is harmless. If the COFF file does include a build-id, then we're going to end up asking debuginfod for the debug file. As build-ids should be unique, this should be harmless, even if debuginfod doesn't contain any suitable debug data, it just costs us one debuginfod lookup, so I'm not too worried about this for now. As with the previous commit, I've done some minimal testing using the mingw toolchain on a Linux machine, GDB seems to still access the split debug information just fine. --- gdb/coffread.c | 24 ++--------------- gdb/elfread.c | 57 +++------------------------------------ gdb/objfiles.h | 10 +++++++ gdb/symfile-debug.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 76 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index e1415d6b258..5898b3a8e08 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -40,8 +40,6 @@ #include "coff-pe-read.h" -#include "build-id.h" - /* The objfile we are currently reading. */ static struct objfile *coffread_objfile; @@ -729,26 +727,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) && objfile->separate_debug_objfile == NULL && objfile->separate_debug_objfile_backlink == NULL) { - deferred_warnings warnings; - std::string debugfile - = find_separate_debug_file_by_buildid (objfile, &warnings); - - if (debugfile.empty ()) - debugfile - = find_separate_debug_file_by_debuglink (objfile, &warnings); - - 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); - } - /* If all the methods to collect the debuginfo failed, print any - warnings that were collected, this is a no-op if there are no - warnings. */ - if (debugfile.empty ()) - warnings.emit (); + if (objfile->find_and_add_separate_symbol_file (symfile_flags)) + gdb_assert (objfile->separate_debug_objfile != nullptr); } } diff --git a/gdb/elfread.c b/gdb/elfread.c index 7900dfbc388..86e7f61586e 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -41,14 +41,12 @@ #include "regcache.h" #include "bcache.h" #include "gdb_bfd.h" -#include "build-id.h" #include "location.h" #include "auxv.h" #include "mdebugread.h" #include "ctfread.h" #include "gdbsupport/gdb_string_view.h" #include "gdbsupport/scoped_fd.h" -#include "debuginfod-support.h" #include "dwarf2/public.h" #include "cli/cli-cmds.h" @@ -1218,59 +1216,10 @@ elf_symfile_read_dwarf2 (struct objfile *objfile, && objfile->separate_debug_objfile == NULL && objfile->separate_debug_objfile_backlink == NULL) { - deferred_warnings warnings; - - std::string debugfile - = find_separate_debug_file_by_buildid (objfile, &warnings); - - if (debugfile.empty ()) - debugfile = find_separate_debug_file_by_debuglink (objfile, &warnings); - - if (!debugfile.empty ()) - { - gdb_bfd_ref_ptr debug_bfd - (symfile_bfd_open_no_error (debugfile.c_str ())); - - if (debug_bfd != nullptr) - symbol_file_add_separate (debug_bfd, debugfile.c_str (), - symfile_flags, objfile); - } + if (objfile->find_and_add_separate_symbol_file (symfile_flags)) + gdb_assert (objfile->separate_debug_objfile != nullptr); 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_no_error (symfile_path.get ())); - - if (debug_bfd != nullptr - && 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; - } - } - } - } - /* If all the methods to collect the debuginfo failed, print the - warnings, this is a no-op if there are no warnings. */ - if (debugfile.empty () && !has_dwarf2) - warnings.emit (); + has_dwarf2 = false; } return has_dwarf2; diff --git a/gdb/objfiles.h b/gdb/objfiles.h index 4b8aa9bfcec..ec9d354e4a7 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -513,6 +513,16 @@ struct objfile bool has_partial_symbols (); + /* Look for a separate debug symbol file for this objfile, make use of + build-id, debug-link, and debuginfod as necessary. If a suitable + separate debug symbol file is found then it is loaded using a call to + symbol_file_add_separate (SYMFILE_FLAGS is passed through unmodified + to this call) and this function returns true. If no suitable separate + debug symbol file is found and loaded then this function returns + false. */ + + bool find_and_add_separate_symbol_file (symfile_add_flags symfile_flags); + /* Return true if this objfile has any unexpanded symbols. A return value of false indicates either, that this objfile has all its symbols fully expanded (i.e. fully read in), or that this objfile has diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index 850da4147a3..961ae2327f7 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -35,6 +35,8 @@ #include "block.h" #include "filenames.h" #include "cli/cli-style.h" +#include "build-id.h" +#include "debuginfod-support.h" /* We need to save a pointer to the real symbol functions. Plus, the debug versions are malloc'd because we have to NULL out the @@ -558,6 +560,70 @@ objfile::require_partial_symbols (bool verbose) } } +/* See objfiles.h. */ + +bool +objfile::find_and_add_separate_symbol_file (symfile_add_flags symfile_flags) +{ + bool has_dwarf2 = true; + + deferred_warnings warnings; + + std::string debugfile + = find_separate_debug_file_by_buildid (this, &warnings); + + if (debugfile.empty ()) + debugfile = find_separate_debug_file_by_debuglink (this, &warnings); + + if (!debugfile.empty ()) + { + gdb_bfd_ref_ptr debug_bfd + (symfile_bfd_open_no_error (debugfile.c_str ())); + + if (debug_bfd != nullptr) + symbol_file_add_separate (debug_bfd, debugfile.c_str (), + symfile_flags, this); + } + else + { + has_dwarf2 = false; + const struct bfd_build_id *build_id + = build_id_bfd_get (this->obfd.get ()); + const char *filename = bfd_get_filename (this->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_no_error (symfile_path.get ())); + + if (debug_bfd != nullptr + && build_id_verify (debug_bfd.get (), build_id->size, + build_id->data)) + { + symbol_file_add_separate (debug_bfd, symfile_path.get (), + symfile_flags, this); + has_dwarf2 = true; + } + } + } + } + /* If all the methods to collect the debuginfo failed, print the + warnings, this is a no-op if there are no warnings. */ + if (debugfile.empty () && !has_dwarf2) + warnings.emit (); + + return has_dwarf2; +} + /* Debugging version of struct sym_probe_fns. */ -- 2.25.4