From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qCGSIeTbCGCybwAAWB0awg (envelope-from ) for ; Wed, 20 Jan 2021 20:41:56 -0500 Received: by simark.ca (Postfix, from userid 112) id 876F61EF80; Wed, 20 Jan 2021 20:41:56 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 399CE1E590 for ; Wed, 20 Jan 2021 20:41:56 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7544A3857034; Thu, 21 Jan 2021 01:41:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7544A3857034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1611193315; bh=vyrq57nLh4t1l3tGUnYZ818pyio/kEUFYL6Haj045es=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Uge70nplYzJQI1C/IjFI+E1cA05e5wdbzhNCAHs7/1unv2SfFUcqH1OhPdUWmSjjJ IYgnU1IGTNjqsvMEuqTcSH8lzF3xGuOkCsmgB0RKHZSInemAileX2Bkc5FTlXu8HyQ iDU1xVZsPZc/VKHbMA84Tq16G3+u+kHnxkF28Aqs= Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 102AB3857034 for ; Thu, 21 Jan 2021 01:41:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 102AB3857034 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 10L1ffuj007753 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Jan 2021 20:41:45 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 10L1ffuj007753 Received: from [10.0.0.11] (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) (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 B5DA81E590; Wed, 20 Jan 2021 20:41:40 -0500 (EST) Subject: Re: [PATCH] gdb/remote.c: Address conflicting enum and method name To: Joel Sherrill , gdb-patches@sourceware.org References: <20210120232959.27573-1-joel@rtems.org> Message-ID: <94f6d25d-5ec9-5bfb-28e1-f535841b6482@polymtl.ca> Date: Wed, 20 Jan 2021 20:41:40 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210120232959.27573-1-joel@rtems.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Thu, 21 Jan 2021 01:41:41 +0000 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Thanks, I wrote a commit message and ChangeLog entry and pushed it. Simon On 2021-01-20 6:29 p.m., Joel Sherrill wrote: > --- > gdb/remote.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/gdb/remote.c b/gdb/remote.c > index b4c6fc2108..5daabf236b 100644 > --- a/gdb/remote.c > +++ b/gdb/remote.c > @@ -1104,7 +1104,7 @@ struct remote_thread_info : public private_thread_info > CORE_ADDR watch_data_address = 0; > > /* Get the thread's resume state. */ > - enum resume_state resume_state () const > + enum resume_state get_resume_state () const > { > return m_resume_state; > } > @@ -6393,7 +6393,7 @@ remote_target::resume (ptid_t ptid, int step, enum gdb_signal siggnal) > > /* We don't expect the core to ask to resume an already resumed (from > its point of view) thread. */ > - gdb_assert (remote_thr->resume_state () == resume_state::NOT_RESUMED); > + gdb_assert (remote_thr->get_resume_state () == resume_state::NOT_RESUMED); > > remote_thr->set_resumed_pending_vcont (step, siggnal); > return; > @@ -6645,7 +6645,7 @@ remote_target::commit_resume () > > /* If a thread of a process is not meant to be resumed, then we > can't wildcard that process. */ > - if (priv->resume_state () == resume_state::NOT_RESUMED) > + if (priv->get_resume_state () == resume_state::NOT_RESUMED) > { > get_remote_inferior (tp->inf)->may_wildcard_vcont = false; > > @@ -6677,7 +6677,7 @@ remote_target::commit_resume () > /* If the thread was previously vCont-resumed, no need to send a specific > action for it. If we didn't receive a resume request for it, don't > send an action for it either. */ > - if (remote_thr->resume_state () != resume_state::RESUMED_PENDING_VCONT) > + if (remote_thr->get_resume_state () != resume_state::RESUMED_PENDING_VCONT) > continue; > > gdb_assert (!thread_is_in_step_over_chain (tp)); > @@ -7803,7 +7803,7 @@ remote_target::select_thread_for_ambiguous_stop_reply > { > remote_thread_info *remote_thr = get_remote_thread_info (thr); > > - if (remote_thr->resume_state () != resume_state::RESUMED) > + if (remote_thr->get_resume_state () != resume_state::RESUMED) > continue; > > if (first_resumed_thread == nullptr) >