From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 76LaM/OAvmrwUCQAWB0awg (envelope-from ) for ; Thu, 01 Oct 2026 11:49:07 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=efficios.com header.i=@efficios.com header.a=rsa-sha256 header.s=selector1 header.b=ZXPoR1oP; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A42A81E01F; Thu, 01 Oct 2026 11:49:07 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 autolearn=ham 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 A81BD1E01F for ; Thu, 01 Oct 2026 11:49:06 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5BB84BB3BC2 for ; Thu, 1 Oct 2026 15:49:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5BB84BB3BC2 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=efficios.com header.i=@efficios.com header.a=rsa-sha256 header.s=selector1 header.b=ZXPoR1oP Received: from YT5PR01CU002.outbound.protection.outlook.com (mail-canadacentralazlp170110005.outbound.protection.outlook.com [IPv6:2a01:111:f403:c103::5]) by sourceware.org (Postfix) with ESMTPS id 12FB04BA79AD for ; Thu, 1 Oct 2026 15:48:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 12FB04BA79AD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 12FB04BA79AD Authentication-Results: sourceware.org; arc=pass smtp.remote-ip=2a01:111:f403:c103::5 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1790869721; cv=pass; b=xn30X81GclEiz7kjhzupWrXXeKBJasUZQwqxK7hPlsed1Ol+1GSNJz5+LuS/rL63QrvDapfhsOlWtyNbZfed3mwI2FH/+2hiJfD5DEeGmm4JlkykW8tKtEjGOwkGs3x3peQCHVmhI8tofwfVFJIaFGXRW0v4LE1to5tQWx1Qpm8= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1790869721; c=relaxed/simple; bh=RNfGPU9Mn6PzmGvR0e6zmd5kzUnvpVzJvf2g+hY3QVg=; h=DKIM-Signature:Message-ID:Date:Subject:To:From:MIME-Version; b=fyItSFqv3x9+JXPLRCgpDZ5QcIlbPfTyF6oP8jn9KtIRpC3WnP0VygcGWmdvcNB0z1haIxm5wXVXoHfyyst9bqmeStXnQ0rcIxeC18prJ13NLjkNypfP0YvSGHUBRpI27aJHSsbPmdIvpUV9ATvp2uq3BOKPvkDCvLg29KuyP1Y= ARC-Authentication-Results: i=2; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=efficios.com header.i=@efficios.com header.a=rsa-sha256 header.s=selector1 header.b=ZXPoR1oP DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12FB04BA79AD ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I/Ntnmih6XzY7zDsSNOeSb9xpY/4uYDQONilipfN9dJYPOEnKZthYFMRqrt30HWvRLkLDIjdI/cgeCl0IwQBx9P+cn8Xy9jXzW7JsGVlsyMdV3VBurgzcTCRH/0bWcZ5SsE/9/dtG4UKeabsg3qMzRbSUjcXYlugaA02qgIvA7JoI6/WHvc58M+ZqepIbWUzrN0Wgl1cVYAtjvNg+ItRJiunMrfeM5yAzgdWyJZOMQ3R2GZblUmwWYHR6KBq+/CeAdN11Fm0NqjfEPOXirFLt+brrxXkJxfu+/bdNub8F4925in91vxP+74cgymX29UMcnDk6U76u20KwJr/yAdVqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9L5QyyUPXpbt7qqNkdMXw0dYBU2rVnRpcCy57mA70AQ=; b=rOcx591b+y9xp147jYicewx8wScHMGHTuTLiaW95Cb3o8jAD65CcF5c4V17/Y30OWvLAYGQjxcSgWEOZ+x7aVXCthdTiQmnRQxO9k8RzN2CqbkebIhFzGzAdfn8yQKWnKiIv+otCQamcQ36g3fu1G5gnRfuvzqiF3l59N8oyV/wNFF0c4C437ta+TkWCh+lE1xMnm+YqI0Z3K3PW9sl8E+xxNsRcij4BbuKNtj50INZPFKlXR867opydU00i3AmkaMKydTjKQHgiDoJLff9fTjnZGQeWSbvQ+OXxfTxyPU3svd+KoNa6EDHD9hy2Qw9CaHxkTHpstpt5VsevFQhiFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=efficios.com; dmarc=pass action=none header.from=efficios.com; dkim=pass header.d=efficios.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9L5QyyUPXpbt7qqNkdMXw0dYBU2rVnRpcCy57mA70AQ=; b=ZXPoR1oPX7ywEefAB6kL12P8RifG7xCsuctneFCTC173LM31QQlhkhZIUzcOxVSZGvhIpo9Vi2uzv/KtWT+PDDey0u8IBE+1TMNrsdYraVyytFIZGjlFMegKUvFIDX0Iqtpxl+RmoQp4pgjhLQXW8HmTy5GH7i26/D3zg9Nucx0Ae2yG/4XnrW6TM4aOHYQnABPTpRv6d+ztlzTsKwYlynGL98wwUzN3wby94b2OGwHwLUfPLZtl6zW0F+xcBQnDwYSt6tNyTuaGwby+W0NVOR50asdqoOfCTKHqmJAjqrPgg6BZK8QOuuiyeicpCkyykPmShgFNXEiqHXpvIE46tQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=efficios.com; Received: from YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2c::6) by YT2PR01MB5446.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:51::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.26; Thu, 1 Oct 2026 15:48:35 +0000 Received: from YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM ([fe80::bbfa:179f:fdc8:b15d]) by YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM ([fe80::bbfa:179f:fdc8:b15d%7]) with mapi id 15.21.0451.026; Thu, 1 Oct 2026 15:48:35 +0000 Message-ID: <3063f0b3-75fc-43eb-a73f-4c8aeb21b284@efficios.com> Date: Thu, 1 Oct 2026 11:48:34 -0400 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 09/11] gdb: add matching helpers to global_symbol_searcher To: Andrew Burgess , simon.marchi@polymtl.ca, gdb-patches@sourceware.org References: <20260929194119.155169-1-simon.marchi@efficios.com> <20261001020952.698419-10-simon.marchi@polymtl.ca> <87pkxtxwew.fsf@redhat.com> Content-Language: fr From: Simon Marchi In-Reply-To: <87pkxtxwew.fsf@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: YQZPR01CA0158.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8c::21) To YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2c::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: YQXPR01MB5418:EE_|YT2PR01MB5446:EE_ X-MS-Office365-Filtering-Correlation-Id: 822f831c-22f1-4e6f-5c35-08df1fd373e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|23010399003|366016|4143699003|56012099006|10067099003|22082099003|18002099003|6133799003; X-Microsoft-Antispam-Message-Info: 08aI20ICte3Ex6pWr6T0IV2K9gwY1tG9G3KaP0yG7E/2+bzRcMAmxpYP2+6aB2CI6bIsltWFwAs8OfYqFKiVijTC1CmhXYpnjLvVV5osBCgAJ70Xzh6ByDhnBaTwY8UCPLxFyQ+JvdR+6pRjuOj4kX1xHKRY6OUwcODqwCA5tpagESZ6S6nhMoTeX3Qsm1a8HXPvbcmHdTkhMGEQIPbBT0fWNwVXQT8vFXk21ipJQqYC2YZsbR/lG8UQlq5TVkUACAQAA7og1a2I/S7E/wwUpAE+JRU5Qr0Fi0jYVnHq5yn70jG4ihZJc64f0ubBm64Jd40fJ1JDeKam64owNdvYzZgjuifi4BNflscxdKrIfivFLlBnmWGY5N8ccTyyl+fwXjWorOpxgPrlWIXOzLgy65xDLFGzLTsfDl4WcjuMNibmPF3UpRyH3YeiENjU5xguKJCa3erv6LbUqPVGa+lIM93tmfRLx/N6Ofw/VXJgmE1XClhXyk2ppzXubeGgR559v50GajxnTcGnmkS0z6mqGVyX0OqQEAqgsxR4M7TolQ++aQaRfK0eses4sJR2MpYibvP53k5Alz4VPoAGMpshJwCyDLgrLp+1hA9EaOBNfEuNuC8crac/vJZBfZh7/YwVKcB5yfAciroEpyoJWwHs//4WYIJG4BcAbIXNiG29UE0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(376014)(1800799024)(23010399003)(366016)(4143699003)(56012099006)(10067099003)(22082099003)(18002099003)(6133799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SjVRNnlEaUJFUEVzNkNIajZXUkJJbm44Nkh2Yk0venB6Z0lkaDZaZnJaby9N?= =?utf-8?B?ZVZuZUxGaW8xenJXUWdSa0d0a2xnNVhuRUcrNG9oRmZVQ3I3bU5zbG1wd000?= =?utf-8?B?Q0MzSVNsdUlkaVFpR1pOMjJtZFo2M1duNEpzRzNrWXY3N29lQUhra3Nzdlhp?= =?utf-8?B?eDJnN2VKTkt3VDFERWdwUDA5T1ozR3M4NUNZZnpFTkdBWmpxZUQydmJtclJw?= =?utf-8?B?MjVuelJrYWRLNDBCR0VmeFhabnFFd1J2T2hEZ2Q0ZnJnTkV1YXJtN3NjekY4?= =?utf-8?B?NFRoeGtSUTNtWGFnQ3FFNDFKZEVmTXJCUSsvenFncGIxbFlvU2dLN0I5MWxv?= =?utf-8?B?WDNSTHZzeldPSEkxQkIwdUNrbHlVNlpiRGhLeXBZbUt2S3lqYTg1WDV2OUw4?= =?utf-8?B?VEVKWU9tNmdRclVFZ3J4SEpSS2RJM0JBU3RKQ3dkZXV5VGFkNTdOUExMUDVp?= =?utf-8?B?cmlHOGpLbTVNeDJYbEYwbDJvb1FOZ0VqT3QvK1JzTHBXT3BLTVAycTgwUE1w?= =?utf-8?B?MXNNTVRHNTVnZnZyQloxcDY0NlZ1M1o5UFdQTFc4RXpHK0s2TmJBVjMrY0JO?= =?utf-8?B?U1JYd01aT2szTEhqcG55Z0lzY0k5YTNpNzEzUU5aS25pWFg5dWxTdXZRbnov?= =?utf-8?B?Mnd3RFh3eGNNbHh0SUNINzVtVWpENHNPTU9wbDBiRlFjOWRIMDBvaHQ5NkFm?= =?utf-8?B?bkZaUUxBUHNXS1hHdi9DYXpxU1pYZkpGQ2VVSndzWnRQK25aMGNwWVZlZGY0?= =?utf-8?B?RFFBS1ZaQlhqa3JEcmhuMW5kbFFFVkhYLzdpeDdFL21ERHRyTXFEdGl5RVRa?= =?utf-8?B?UVdya0gxM1A2dTErT3g2bHRvT0NUU1hOR3k1Z1ltZDM1Y0hhNTVjV2NjMDZZ?= =?utf-8?B?cStIV1Y5bVA4dGpzM1JHUkd1Z0x2WlJycG1MaGNBNll2NjQyWDNndzdaT3hY?= =?utf-8?B?TWE3Um9Ec1d4UUZLRXYwRHZtYnkxRzZUREZNRnd6OXNHS0pMUXFvR2JGbEN3?= =?utf-8?B?b1JRVHIzdU5nb2RPb0djSGtRZEdocS83THdqSWR2eit3SU5YWWpIMXREcmtC?= =?utf-8?B?Q1NTbEFVYmdmSFJVajQ0bzlwRWhJYklBekc4WXd4VzRDb1U3SzkzOEpJbysy?= =?utf-8?B?T2VMaGJMOFFqSVhuRlNRQVN3akhESmt1OUhYNy8xTllPczJ4NTJsaWtuK1Bv?= =?utf-8?B?RnVWclcrREVIL1BNMi9FRENLcVl5UWFOZHVZeS80SXBBWHY5dFZpeW9YZWE1?= =?utf-8?B?RE9qbnBRTFltbXRVNG03VzN3WDN0TTVSVVltRDQwSURWTTZ4WStKR1ZLY3k3?= =?utf-8?B?RElLRmxtZ1FJeHN1TkxtZitoTFVEQTYvK1BYZW1lbmVuTmNINk9NZlVwMFVy?= =?utf-8?B?WTFTOS9ZTzc3dWRoNXZUb2NxODQ1TFZaa3ZxQ3hKMkNpeEo4V3dOZVpUS0NY?= =?utf-8?B?RFlJc0tDWWJ4NVBXU1JDN2N6bUcrS055NkJCWWh1Q2pha04wQ0tTYm9kT0V5?= =?utf-8?B?SjdJY3ovdkQrek11aUNMaVRseFZJSzFWKzFGOFA2TXBQTlBZT2c4Q1paRStS?= =?utf-8?B?SFo2ODByckxGVEZCcVdFcW9lYnFOK0FCTUdaMnNwS0xiZEJkcVZsbEd4c3Vm?= =?utf-8?B?N0lqbk0vbWlBMlVQVUkrNXFyNm9oaHRtY3FZRDB2ZkpYY09yaFoxVjdraEpF?= =?utf-8?B?M2tPY0hnWS9EVDBvRWFLV1pRZXc5MWQyTXNONi85dm94d1BYSnpudlhDQnc4?= =?utf-8?B?b285Wis4by9ZMzM2dm9TeHE2V3VFcjFHQlRGaHBNelc1M0srNm9PMG9hUmpn?= =?utf-8?B?UXp0YTBya00yWlloeGRVbllhOWNPaGF3ZWNTN01jTTlBZ0RURzJta3ErOU1Y?= =?utf-8?B?d2RmbGVqa0l6SGkzckQ1NWVIaVN1N0FNbUYyZlVWR0RGUnM3TW1IRjBGSWRU?= =?utf-8?B?VDE5MU40WWtyWUpSRGhYdm5EckhRU1hmMllrNGxHOU5tWVNjZjlwTEczMWw3?= =?utf-8?B?UklxVzFubmptMnEzM3Y0Mi9TVnR3dTYrdGFNMldBQ2NxOVdCSkNhenpIRFZO?= =?utf-8?B?QkNRL1gzUk50R3RrdzVNU205UUQxSW1acXN5aU1KS3J0dlRiS0dnVlJSdzQv?= =?utf-8?B?QTdkNWZOMk5qOEcwSGVlWTJwTTV5RzRZMkJhbkZhYkxkem1McHo5aVdCdmhm?= =?utf-8?B?OERSSi93QzBDK1M4d3FWdExnSklrUU9IT2RldzRHck9idkx1NEZIQnYxdTVy?= =?utf-8?B?MWFjYy8zRFM3MVZDSk9JbDJyaUJrYmtBRTBpaXZYSW1qL1k0SmRLS2E4dzkv?= =?utf-8?B?TzRiMmQycDVmTXRxQjZIYzZQUVJ6ZlI4UVpOQ0lBelZwT2pyOTFiZz09?= X-OriginatorOrg: efficios.com X-MS-Exchange-CrossTenant-Network-Message-Id: 822f831c-22f1-4e6f-5c35-08df1fd373e8 X-MS-Exchange-CrossTenant-AuthSource: YQXPR01MB5418.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2026 15:48:35.4656 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4f278736-4ab6-415c-957e-1f55336bd31e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Unj3lDuSKMBQnnHZPMgxajopDUNLqXpSqkAHectL7dYMIparXRbDBIKUY/DxDUZwVCXdJuLQ+Azn0NGI0Rp2fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5446 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 On 10/1/26 11:39 AM, Andrew Burgess wrote: > 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. Yes, I had already fixed them following your previous review. > With that fix: > > Approved-By: Andrew Burgess Thanks, Simon