From patchwork Tue Nov 21 03:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 80398 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 873543858439 for ; Tue, 21 Nov 2023 03:54:24 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) by sourceware.org (Postfix) with ESMTPS id 028043858C50 for ; Tue, 21 Nov 2023 03:53:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 028043858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 028043858C50 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700538803; cv=none; b=j/VMTMZX0QEug88kXWVpGHeFxsB8/dfaQribXhKrMCnsGXG13AL+FrT1sWiWR2zjZAXkxVWixkHsCsasdd4jJxgRFXbhlUwc2AK02c/qQ1+A1p72UOpmYFHrR/NnUSVXcob0909U5plueJm4baKBJL7WqADnW5pVSyCf2VDxGkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700538803; c=relaxed/simple; bh=najN2t/t6MxhweWQk4mL2w4afdgYN0iAatqrYM7ngNo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=mfD5GtCVOFFyzuBx4IjkUXhqabKz0rSzgcSyX8HzUkvp2ah78MA7GFeS0mpI3GTdBZxTtDIdZ69QDYj2cnn47htpkGKeG9aAHt+O2fCBicC1yOg0bBQrNhpfruOeQiTiX7BJSGIBjTKu0A7ca+cA0ALIu/lFpQX7BxSu6a2jwZc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6003a.ext.cloudfilter.net ([10.0.30.151]) by cmsmtp with ESMTPS id 5BpqrOjv5jtZ35HpFrWync; Tue, 21 Nov 2023 03:53:25 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 5Hp9r0SroAKSc5Hp9rxntn; Tue, 21 Nov 2023 03:53:20 +0000 X-Authority-Analysis: v=2.4 cv=N6w6qkxB c=1 sm=1 tr=0 ts=655c29b0 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=BNY50KLci1gA:10 a=Qbun_eYptAEA:10 a=TmsUUf6PHUkJMu_j2N4A:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1rJpysJvNKyULzyCMnB/05JNWNwmfvRq3Kl4AsdkU0c=; b=qoEKZB8Wm3RE8953tmU2+oYi1S fuVQjwp/q4I9z1iTJRBpLo72Qg1Oj7dg4qaVWL+Rw7xBl6iHHSd3ljlvcYxuH5SNViidnA+svXUnE nUcxhjVjY3svCkFRNqLG37UDH; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:47856 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1r5Hp9-0040be-1M for gdb-patches@sourceware.org; Mon, 20 Nov 2023 20:53:19 -0700 From: Tom Tromey Date: Mon, 20 Nov 2023 20:53:39 -0700 Subject: [PATCH 08/29] Split up a big 'if' in symtab.c MIME-Version: 1.0 Message-Id: <20231120-submit-domain-hacks-2-v1-8-29650d01b198@tromey.com> References: <20231120-submit-domain-hacks-2-v1-0-29650d01b198@tromey.com> In-Reply-To: <20231120-submit-domain-hacks-2-v1-0-29650d01b198@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.77.73 X-Source-L: No X-Exim-ID: 1r5Hp9-0040be-1M X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net ([192.168.0.21]) [97.122.77.73]:47856 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEbxxsK8mkTuMJZfrMZ8TLFsRZ0ngxl7P7qZ6a3hDrB+hu4ilgf0FC2382XExPf75lmbkB5YdBVs7TJvtBmGa/Nv6XbaIPWzNXW1CvBrf5gHLnbB/gTS suWD5K4bD/TVqciW0Igtsg7w6Z38BiD4XB1rydAXoHdBcuiytkJ0Di9jMJ3YnZFoGtrg4BtMkSJ33JHlcMgimckM2RyfzkiQMKs= X-Spam-Status: No, score=-3024.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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 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+patchwork=sourceware.org@sourceware.org global_symbol_searcher::add_matching_symbols in symtab.c has a gigantic 'if' statement -- 33 lines of conditional expression. This patch splits it up into a series of separate 'if's. --- gdb/symtab.c | 83 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 6abebcd929c..9e28edff7b4 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4758,39 +4758,56 @@ global_symbol_searcher::add_matching_symbols /* Check first sole REAL_SYMTAB->FILENAME. It does not need to be a substring of symtab_to_fullname as it may contain "./" etc. */ - if ((file_matches (real_symtab->filename, filenames, false) - || ((basenames_may_differ - || file_matches (lbasename (real_symtab->filename), - filenames, true)) - && file_matches (symtab_to_fullname (real_symtab), - filenames, false))) - && ((!preg.has_value () - || preg->exec (sym->natural_name (), 0, - NULL, 0) == 0) - && ((kind == VARIABLES_DOMAIN - && sym->aclass () != LOC_TYPEDEF - && sym->aclass () != LOC_UNRESOLVED - && sym->aclass () != LOC_BLOCK - /* LOC_CONST can be used for more than - just enums, e.g., c++ static const - members. We only want to skip enums - here. */ - && !(sym->aclass () == LOC_CONST - && (sym->type ()->code () - == TYPE_CODE_ENUM)) - && (!treg.has_value () - || treg_matches_sym_type_name (*treg, sym))) - || (kind == FUNCTIONS_DOMAIN - && sym->aclass () == LOC_BLOCK - && (!treg.has_value () - || treg_matches_sym_type_name (*treg, - sym))) - || (kind == TYPES_DOMAIN - && sym->aclass () == LOC_TYPEDEF - && sym->domain () != MODULE_DOMAIN) - || (kind == MODULES_DOMAIN - && sym->domain () == MODULE_DOMAIN - && sym->line () != 0)))) + if (!(file_matches (real_symtab->filename, filenames, false) + || ((basenames_may_differ + || file_matches (lbasename (real_symtab->filename), + filenames, true)) + && file_matches (symtab_to_fullname (real_symtab), + filenames, false)))) + continue; + + if (preg.has_value () && !preg->exec (sym->natural_name (), 0, + nullptr, 0) == 0) + continue; + + bool matches = false; + if (!matches && kind == VARIABLES_DOMAIN) + { + if (sym->aclass () != LOC_TYPEDEF + && sym->aclass () != LOC_UNRESOLVED + && sym->aclass () != LOC_BLOCK + /* LOC_CONST can be used for more than + just enums, e.g., c++ static const + members. We only want to skip enums + here. */ + && !(sym->aclass () == LOC_CONST + && (sym->type ()->code () + == TYPE_CODE_ENUM)) + && (!treg.has_value () + || treg_matches_sym_type_name (*treg, sym))) + matches = true; + } + if (!matches && kind == FUNCTIONS_DOMAIN) + { + if (sym->aclass () == LOC_BLOCK + && (!treg.has_value () + || treg_matches_sym_type_name (*treg, + sym))) + matches = true; + } + if (!matches && kind == TYPES_DOMAIN) + { + if (sym->aclass () == LOC_TYPEDEF + && sym->domain () != MODULE_DOMAIN) + matches = true; + } + if (!matches && kind == MODULES_DOMAIN) + { + if (sym->domain () == MODULE_DOMAIN + && sym->line () != 0) + matches = true; + } + if (matches) { if (result_set->size () < m_max_search_results) {