From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id T1QWHd7kCGB5cQAAWB0awg (envelope-from ) for ; Wed, 20 Jan 2021 21:20:14 -0500 Received: by simark.ca (Postfix, from userid 112) id 6F56A1EF80; Wed, 20 Jan 2021 21:20:14 -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.3 required=5.0 tests=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 0D7F51E590 for ; Wed, 20 Jan 2021 21:20:13 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C7D48385E021; Thu, 21 Jan 2021 02:20:12 +0000 (GMT) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by sourceware.org (Postfix) with ESMTPS id 45662385E021 for ; Thu, 21 Jan 2021 02:20:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 45662385E021 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rtems.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=joel.sherrill@gmail.com Received: by mail-lj1-f178.google.com with SMTP id n11so767867lji.5 for ; Wed, 20 Jan 2021 18:20:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=RrJUbgs8APdfjJL9JH73aC2gBpzXpfeMUqE6+y99bdk=; b=kl85VuWQEgQ29EUqjWC0y5Om0z1KqOkfoI2LuKpaNR28ltHAZ+OJiOnVXdKhmIJrM4 hOMnZS+9yLNSAsOxY+pAijjmwa0gGsBAdiw/kbUW05G7fvlGCelEWY9ozF5tyNMtULtU iJzDCJ6pCPUqjcHc83YYt6agOtukqUy6lM33HTyRFynlEZRjq3k3h4aSBADbzuBfmWKV d6tbXAuj8oxVQC3iXbG2mGRagqC0xxu5VzTqw+UrzSfgLBTxdSBu4Kc3CYKlJwmCy/LW WG+gFG5CtHc9WRhMwkGsBNqKa85ETJD9rJKZlj0SKvtKPYEhr1PD27kbTXGnaDbH+IlM OtvA== X-Gm-Message-State: AOAM533Fh7XQddMEmKel3oMxWTVniFj3lzddg56EHPXGZGis2rqnGmlO 6gf7e46uFf67t3Sukwvq93DTeUI/nZM= X-Google-Smtp-Source: ABdhPJzV7KBg1X3fCZF0yig8+EIzBPeoOd9C5+xh578lS5QEs/Frf7plwgjjRZfGlm9IvIzI8tXADw== X-Received: by 2002:a2e:300e:: with SMTP id w14mr5806927ljw.170.1611195607689; Wed, 20 Jan 2021 18:20:07 -0800 (PST) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com. [209.85.167.52]) by smtp.gmail.com with ESMTPSA id z7sm362345lfd.228.2021.01.20.18.20.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jan 2021 18:20:06 -0800 (PST) Received: by mail-lf1-f52.google.com with SMTP id m22so400719lfg.5 for ; Wed, 20 Jan 2021 18:20:06 -0800 (PST) X-Received: by 2002:a19:7ec9:: with SMTP id z192mr5675388lfc.50.1611195606707; Wed, 20 Jan 2021 18:20:06 -0800 (PST) MIME-Version: 1.0 References: <20210120232959.27573-1-joel@rtems.org> <94f6d25d-5ec9-5bfb-28e1-f535841b6482@polymtl.ca> In-Reply-To: <94f6d25d-5ec9-5bfb-28e1-f535841b6482@polymtl.ca> From: Joel Sherrill Date: Wed, 20 Jan 2021 20:19:53 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] gdb/remote.c: Address conflicting enum and method name To: Simon Marchi Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: , Reply-To: joel@rtems.org Cc: GDB patches Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" On Wed, Jan 20, 2021, 7:41 PM Simon Marchi wrote: > Thanks, I wrote a commit message and ChangeLog entry and pushed it. > Thanks. This was too easy to stay broken. I will close the PR if it didn't get picked up > > 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) > > >