From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id owMCCtV+vmqmSCQAWB0awg (envelope-from ) for ; Thu, 01 Oct 2026 11:40:05 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iH2f6Z1D; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1F9A41E051; Thu, 01 Oct 2026 11:40:05 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::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 902561E01F for ; Thu, 01 Oct 2026 11:40:04 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5636C4BB3BBE for ; Thu, 1 Oct 2026 15:40:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5636C4BB3BBE Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iH2f6Z1D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id BB80A4B99F5B for ; Thu, 1 Oct 2026 15:39:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB80A4B99F5B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 BB80A4B99F5B Authentication-Results: sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790869164; cv=none; b=j6g48C2xnEMrQiULAeBi2R2I6Ln+M631JMg7EDBZLU7QMSmpMYvzxM52m5WEy9SwahvRvJZI4M4G+2wigR+yqGdD1Vq3SP7PIb3ypU9sX1hvpH52CNBipaRU6TF7qUDd9OqCHJgYS4+5/I/SYDftKuiNnglWTecLQzM24JmAJ5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790869164; c=relaxed/simple; bh=uRvUDMZBwbkJDEJbLT7jVwBS2KwAGRWEkCdZO9xGja4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=dTuTK9gIvjuCYS9s0WYywMWZiaOAIOiQrFdIwDgHuvr0KhdkCNsWVQCwoiVIWRKrI+nrNPpMYjzekOO1I1UmcL1ydOJO7f7ylWB9v1ct3RRs010dJrdlfJrA9jhBvQGRwPpgP3HCkKNRzl98O4xxTCtEXcj0v38vU4KkftVtMi4= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iH2f6Z1D DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB80A4B99F5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790869164; 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: in-reply-to:in-reply-to:references:references; bh=avtKd1zk8Pnk0hrQuQYOdJZssBcXCbVNkW+p7r0XuwE=; b=iH2f6Z1DmQNLKfnZgF5E2QKnws9IjBIVoGP4moln3wgVifp0Np2XEEuOWJDf3VQJ3XD9bd n/TGptdNMYNVkj1C9RoOqLfB9GVPVH6Wti3LZNsbxPDjzBacNp9EttllT4l4b3ygCvIe2O zmfHqnSUkw6h/6xCP3qAgFo0kz1J06I= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-345-XqM5rTuOMV2Ed0LaRau2XA-1; Thu, 01 Oct 2026 11:39:22 -0400 X-MC-Unique: XqM5rTuOMV2Ed0LaRau2XA-1 X-Mimecast-MFC-AGG-ID: XqM5rTuOMV2Ed0LaRau2XA_1790869162 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a02085598fso7904835e9.3 for ; Thu, 01 Oct 2026 08:39:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790869161; x=1791473961; h=content-type:mime-version:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=avtKd1zk8Pnk0hrQuQYOdJZssBcXCbVNkW+p7r0XuwE=; b=eWZhuyho3hxJP0qyzG3RFPe6dIdNTeeIepejbUZHCPzt5YzHUDam5ymJtkKppgyAtZ oRcp00QNIOXHiIZEy5+LlrlMqlogpOXzZq5cbqNezetRVNUhQOgtWvRw/sQLeWIoxGxF SBn7EXgwT/u72pGG1aVBWWG+uMKKiRwOvW2gamREBcJWGrcuE4Tu8BlLy4SjRkn42ng2 ya2sYulMuvZRC7lMqmcH9uWVt2FPfmdqSrBZoK5bso6f1HNiQK39070RL3ZNIqW6jdrS Xkb1D7tsHBHpYzGWZB2I2aDAAKWhjtx1cq17znFjBaEyU7I68MNFMRkvr4b6BxGVgWyd 1hJA== X-Forwarded-Encrypted: i=1; AKwUvBwHLmTSew4+d3/ltfZcrIuswXpZ5tGgHtiX6+oMJ2rFHoW7Fkm1eZ5Lrxz3OzW1zfuuxdRU1lxNifW0Cg==@sourceware.org X-Gm-Message-State: AFuF++lBV+a0Glc84oXji67SeICyNqQKd6H92lp4FvhCzWs3LYPrTS8p WlhisT8zyzTThb1i8krldD7R3vb7bzS0jOEIVSyX4Om+CLFCpqwDn++V7Glwb/QojWb/F7cqV/3 P8f/1JfaiAO9EQx/Io04ZZrtXbcB8lxZ/Rc/Scsb0/RydVRGsY6OFP5kiGz4dQHzscqTVr4g= X-Gm-Gg: AYBFou3yF5udm52L3I/odouXCRgTOhOcgtx2tQXTkBjoB+c5SnBcakLkUYYGU6t8O6t i6FVKtFKDtHpMwhBTTTatoVFA7efSqD2QiE/P4B62CfLqAn+G8jpR3QYKb6MR09HTYeJZdowcgJ JT570ScVPzxsZBrctoRdyX6ccHykf+JNpOWzIo9DL9vksDktMacalJwkBFPTzaHrHOVeX8Ftp3Y Y1j2ZWyAs4zPqyT1iE23ktQhm9enxhtT7Sf5l8YkSpeM6ByRQD6eTUb9Aq1G5VnM4cpIUHAo+ZM psdr0HqF2e1PbnoYPNa6t1sKDVg9Ec6a4Mw8EBPfd6WbKUKGY4cx/am+QztPR0cSoM5q X-Received: by 2002:a05:600c:3510:b0:4a0:c4:a1e0 with SMTP id 5b1f17b1804b1-4a02756729dmr194825e9.9.1790869161493; Thu, 01 Oct 2026 08:39:21 -0700 (PDT) X-Received: by 2002:a05:600c:3510:b0:4a0:c4:a1e0 with SMTP id 5b1f17b1804b1-4a02756729dmr194445e9.9.1790869161048; Thu, 01 Oct 2026 08:39:21 -0700 (PDT) Received: from localhost ([213.31.44.29]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a023ebe694sm55297525e9.10.2026.10.01.08.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2026 08:39:20 -0700 (PDT) From: Andrew Burgess To: simon.marchi@polymtl.ca, gdb-patches@sourceware.org Cc: Simon Marchi Subject: Re: [PATCH v2 09/11] gdb: add matching helpers to global_symbol_searcher In-Reply-To: <20261001020952.698419-10-simon.marchi@polymtl.ca> References: <20260929194119.155169-1-simon.marchi@efficios.com> <20261001020952.698419-10-simon.marchi@polymtl.ca> Date: Thu, 01 Oct 2026 16:39:19 +0100 Message-ID: <87pkxtxwew.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: E27vxqQRGhI9Y9OOfdaFYDBwPf0mNRnfIb0RPkkzIRk_1790869162 X-Mimecast-Originator: redhat.com Content-Type: text/plain 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 simon.marchi@polymtl.ca writes: > From: Simon Marchi > > The methods of global_symbol_searcher repeat the same checks in several > places. Add some helpers to make the code easier to follow: > > - name_matches: check a name against the (optional) name regexp > > - symtab_matches_filenames: check a symtab against the searched file > names > > - symbol_matches: all the filtering done on full symbols in > add_matching_symbols > > - msymbol_matches: the filtering done on minimal symbols, shared by > expand_symtabs and add_matching_msymbols > > Switch expand_symtabs, add_matching_symbols and add_matching_msymbols to > use early continues to avoid deeply nested ifs. > > Change-Id: I553f70fb8ea9c7e55b89bb1204a402938c116c3b > --- > gdb/symtab.c | 205 ++++++++++++++++++++++++++++----------------------- > gdb/symtab.h | 16 ++++ > 2 files changed, 130 insertions(+), 91 deletions(-) > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index fc0ff22448ee..ef21f285abcd 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -4906,34 +4938,25 @@ global_symbol_searcher::add_matching_msymbols > { > QUIT; > > - if (msymbol->created_by_gdb) > + if (!msymbol_matches (msymbol, name_regex)) > continue; > > - if (is_suitable_msymbol (msymbol)) > - { > - if (!name_regex.has_value () > - || name_regex->exec (msymbol->natural_name (), 0, > - NULL, 0) == 0) > - { > - /* For functions we can do a quick check of whether the > - symbol might be found via find_pc_symtab. */ > - if (m_kind != symbol_search_kind::FUNCTION > - || (find_compunit_symtab_for_pc > - (msymbol->value_address (objfile)) == NULL)) > - { > - if (lookup_symbol_in_objfile_from_linkage_name > - (objfile, msymbol->linkage_name (), > - SEARCH_VFT).symbol == NULL) > - { > - /* Matching msymbol, add it to the results list. */ > - if (results->size () < m_max_search_results) > - results->emplace_back (GLOBAL_BLOCK, msymbol, objfile); > - else > - return false; > - } > - } > - } > - } > + /* For functions we can do a quick check of whether the > + symbol might be found via find_pc_symtab. */ > + if (m_kind == symbol_search_kind::FUNCTION > + && (find_compunit_symtab_for_pc > + (msymbol->value_address (objfile)) != NULL)) > + continue; > + > + if (lookup_symbol_in_objfile_from_linkage_name > + (objfile, msymbol->linkage_name (), SEARCH_VFT).symbol != NULL) Two lines here where NULL can be updated to nullptr. With that fix: Approved-By: Andrew Burgess Thanks, Andrew