From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WdW2G3Ama2m+SgcAWB0awg (envelope-from ) for ; Sat, 17 Jan 2026 01:04:32 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=B5VkO5pA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 6CAED1E0DD; Sat, 17 Jan 2026 01:04:32 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 200DC1E08D for ; Sat, 17 Jan 2026 01:04:32 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id A6E3B4BA23F1 for ; Sat, 17 Jan 2026 06:04:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6E3B4BA23F1 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=B5VkO5pA Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 5CFFA4BA2E2A for ; Sat, 17 Jan 2026 06:03:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5CFFA4BA2E2A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5CFFA4BA2E2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1768629822; cv=none; b=LR3c7yRaPKJXCrZe0W6/yjFlfI8xntDBGIgBVyHbJ9D6Q0JRXqNP/PnX6V8O/Wp4R7yocOSTppEekciiNPkwkrrOQlpBofp6zZJ5tcKIyo8otE4BOaLGbRxrMQll2cdpWB8M7nt/OxyY6U3z4QqPEr/kpB1JIGgDbwYdqIRZ1sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1768629822; c=relaxed/simple; bh=yyalUIjlYkaEm26I9Skizq//is+94HWMwFyq60sErNk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SMZEvTcALPtzfsAbiSmMJ3Q0t4iv6olGdQ5IdMX3nff/7FOkq4l/AUp1EfaU4iAyaHHdm6+oDvtEV2X0EEvAf69Y825OOM50Ccvl/DaIEJRJh7ha1VkiDMd35ovSAtF3+kSdMogrWa8uXMQYD6FTfmSkRJREGu9+qi/utYd4QcA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CFFA4BA2E2A Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 60H63adw096111 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 17 Jan 2026 01:03:41 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 60H63adw096111 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1768629821; bh=MZQBflayO0oCjmA0MWtZYck6Mw8aNg8Ne9cbcyHWyJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=B5VkO5pAKOiptS3SVmCBdU8X9uJGh+GlEkSM5kTCK77BGLYfPEV/1KhLOji/qOShJ lijI4RFZxtBkoCoo7FoGQOxulGATovLG4dO76Q2DvEclxN38jlpe/sVkC2HnmX7zjI VhqtGV8UtbJXeASM2LAwQMIAYbKCrIz5kQ//1+cAaMLG6Sr9WrW3mvJCJfTtOsK7v6 RN9eWULaOrnqWH+v4JeIfQPe2gu2s0rp3wRXBAYFAdzHEvlvaKHV2pDlsEsy1nmqEc vSX/A6DyW1TQmgQQI6sM8/7hG3+/5NCP2rl+shixc7+ofhMQOSGqFuIRGerWzYjQ+c SKtGIsRVZG6gg== Received: by simark.ca (Postfix) id 64B991E093; Sat, 17 Jan 2026 01:03:36 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/5] gdb/dwarf: merge one CU/TU code path Date: Sat, 17 Jan 2026 01:02:31 -0500 Message-ID: <20260117060335.691691-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260117060335.691691-1-simon.marchi@polymtl.ca> References: <20260117060335.691691-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Sat, 17 Jan 2026 06:03:36 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Simon Marchi Simplify the code by merging the paths for CUs and TUs. It is also not necessary to check if the maps are empty. Change-Id: I43e2cf4bb1217a72dda8a03957ed733f87bf57b2 --- gdb/dwarf2/read.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 98cc1aa5b941..331f1b9c5261 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7560,30 +7560,19 @@ cutu_reader::lookup_dwo_cutu (dwarf2_cu *cu, const char *dwo_name, dwo_file = add_dwo_file (per_bfd, std::move (new_dwo_file)); } - if (dwo_file != NULL) + if (dwo_file != nullptr) { - struct dwo_unit *dwo_cutu = NULL; + dwo_unit_set &dwo_units + = is_debug_types ? dwo_file->tus : dwo_file->cus; - if (is_debug_types && !dwo_file->tus.empty ()) + if (auto dwo_unit_it = dwo_units.find (signature); + dwo_unit_it != dwo_units.end ()) { - if (auto it = dwo_file->tus.find (signature); - it != dwo_file->tus.end ()) - dwo_cutu = it->get (); - } - else if (!is_debug_types && !dwo_file->cus.empty ()) - { - if (auto it = dwo_file->cus.find (signature); - it != dwo_file->cus.end ()) - dwo_cutu = it->get (); - } - - if (dwo_cutu != NULL) - { - dwarf_read_debug_printf ("DWO %s %s(%s) found: @%s", - kind, dwo_name, hex_string (signature), - host_address_to_string (dwo_cutu)); - - return dwo_cutu; + dwarf_read_debug_printf + ("DWO %s %s(%s) found: @%s", kind, dwo_name, + hex_string (signature), + host_address_to_string (dwo_unit_it->get ())); + return dwo_unit_it->get (); } } } -- 2.52.0