From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 610443857039 for ; Wed, 5 Aug 2020 20:25:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 610443857039 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark@simark.ca Received: from [172.16.0.95] (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 661761E4BC; Wed, 5 Aug 2020 16:25:36 -0400 (EDT) Subject: Re: [PATCH 4/4] gdb: change regcache list to be a map To: Pedro Alves , Simon Marchi , gdb-patches@sourceware.org Cc: Laurent References: <20200720204101.2849535-1-simon.marchi@efficios.com> <20200720204101.2849535-5-simon.marchi@efficios.com> <5b521483-2f09-3424-943d-40f83b3080af@palves.net> <82d8b01a-2b37-0b79-f657-1081375270ee@simark.ca> <0b8d1bd2-156f-626e-a6b8-813d69cc1340@simark.ca> <27f7abde-0118-efee-6001-6b4b8f2d46a8@palves.net> From: Simon Marchi Message-ID: <56bd04f4-1c55-ab51-e80e-d320858a5d47@simark.ca> Date: Wed, 5 Aug 2020 16:25:35 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <27f7abde-0118-efee-6001-6b4b8f2d46a8@palves.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: tl X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, NICE_REPLY_A, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 20:25:38 -0000 On 2020-08-05 2:02 p.m., Pedro Alves wrote: > On 7/30/20 6:03 PM, Simon Marchi wrote: >> On 2020-07-30 12:58 p.m., Simon Marchi wrote: >>> It's down to: >>> >>> for (auto it = regcaches.begin (); it != regcaches.end ();) >>> { >>> if (it->second->target () == target) >>> it = regcaches.erase (it); >>> else >>> it++; >>> } >> Ah, I see that you've provided me a patch for that too (I thought you only >> did the multi-level map thing). > Note that it's idiomatic to write ++it instead of it++, to avoid > creating a temporary. It's possible that compilers nowadays optimize > it away, but it still looks odd to not write ++it to me. Ack. > > Your code is: >> for (auto it = regcaches.begin (); it != regcaches.end ();) >> { >> if (it->second->target () == target) >> { >> delete it->second; >> it = regcaches.erase (it); >> } >> } >> >> I think you are missing an it++ in the else? Otherwise, when the target doesn't >> match, we'll get into an infinite loop I presume. > Yes, I was. I didn't notice because I jumped straight to the multi-map > patch on top, which deletes that code, IIRC. > Thanks. Simon