From patchwork Tue Mar 18 02:15:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 108273 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 1948A3858404 for ; Tue, 18 Mar 2025 02:28:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1948A3858404 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=pelE7yPt X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta038.useast.a.cloudfilter.net (omta038.useast.a.cloudfilter.net [44.202.169.37]) by sourceware.org (Postfix) with ESMTPS id D8E493857C68 for ; Tue, 18 Mar 2025 02:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8E493857C68 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 D8E493857C68 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; cv=none; b=bT7PNDJE/jLITx/TCJJwMmkgPUM90CDaSC8WbIZkFLvQqvyJJaM1emImDyEdYynmmBOuQ+WS+ciPMO9CCYXxiU8p+BDU16u8MGuBPiGG4pllNt0lSmzXeAM7H1zgOuccTQxcR0c8XeSTX9aZlXvll2FKM/4zDFvU7juwPLdaRhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742264106; c=relaxed/simple; bh=fmKFMVvADzLOylswu9neHrDLZ7sdjYLWCQ9R739nMi8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=G+3oucOZCsO615nXMFqL7qQ1gLoICVaqut2UlhWPgkiRLSPNGDH0R1qvUSZfe0iYBliAaXoduaJ9eANU9IC0xWiIsTVsQaMWrE5Bj59R2MxgoCsLfQWglqifnebogGOA5MpQqRbIDCrcI29ygbqkahjI9lEqYVDiH1Voj55Vl58= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8E493857C68 Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id uLQ8taD97iuzSuMTytc7eM; Tue, 18 Mar 2025 02:15:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id uMTxtZtDrSasJuMTytOBVw; Tue, 18 Mar 2025 02:15:06 +0000 X-Authority-Analysis: v=2.4 cv=A4dqPbWG c=1 sm=1 tr=0 ts=67d8d72a a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=IxUmcl3QsLgjY5Up4KYA:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=PfIDLSzJglXwDtMdvwPeF/L+DdHQ09Mhc+LIEHmC3IQ=; b=pelE7yPtxb9R5R94Jg/+TP2uyc s+pGm+vTlqaPJLlYsFfDtT2VJA8y+dn4LQwqeMHqlUUJPeI8Gxnv1jQHDLQGYlCY29YfNlTZi7xIT 4CG+jCrsVbqLRRkqO1ASfwXDh; Received: from 97-122-96-32.hlrn.qwest.net ([97.122.96.32]:36240 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1tuMTx-00000002cIx-1R5z; Mon, 17 Mar 2025 20:15:05 -0600 From: Tom Tromey Date: Mon, 17 Mar 2025 20:15:10 -0600 Subject: [PATCH 17/19] Use gdb unordered set and map in cp-namespace.c MIME-Version: 1.0 Message-Id: <20250317-replace-std-stuff-v1-17-7ba4ee88e218@tromey.com> References: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> In-Reply-To: <20250317-replace-std-stuff-v1-0-7ba4ee88e218@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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.96.32 X-Source-L: No X-Exim-ID: 1tuMTx-00000002cIx-1R5z X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-96-32.hlrn.qwest.net (prentzel.local) [97.122.96.32]:36240 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDPWOfwJh6pwZ2wJ2609lcN741Y7eKdB4gZRpOgMbTyhbxO+Q2ppfBS9VvVaDfrpTqRvHBC9jlqVaIibrluvMx7KXxp+O/6be5io9DvVDnFFNlM1Zz4T XB1vhCn0zOagHHT6VKM3puoVOZWu4Su28oqTGQl2hV26VyiXfld7bG+g5wmWelpSWm4i0H40u/2sE6WPh0umj199XGxJHKDVy5o= X-Spam-Status: No, score=-3017.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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 This changes cp-namespace.c to use gdb::unordered_map. --- gdb/cp-namespace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index dc018a2ef286cf84a1b5b38f073849043037faf3..1639cdba967090cc604bec97b929ee69e07268a6 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -32,7 +32,7 @@ #include "language.h" #include "namespace.h" #include "inferior.h" -#include +#include "gdbsupport/unordered_map.h" #include #include @@ -352,6 +352,9 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, return sym; } +/* Type used for collecting symbols. Maps names to symbols. */ +using symbol_map = gdb::unordered_map; + /* This version of the function is internal, use the wrapper unless the list of ambiguous symbols is needed. @@ -391,8 +394,7 @@ cp_lookup_symbol_via_imports (const char *scope, const int search_scope_first, const int declaration_only, const int search_parents, - std::map& found_symbols) + symbol_map& found_symbols) { struct block_symbol sym = {}; int len; @@ -509,7 +511,7 @@ cp_lookup_symbol_via_imports (const char *scope, const int declaration_only, const int search_parents) { - std::map found_symbols; + symbol_map found_symbols; cp_lookup_symbol_via_imports(scope, name, block, domain, 0, declaration_only, search_parents,