From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by sourceware.org (Postfix) with ESMTPS id 966C43829BD2 for ; Fri, 27 May 2022 18:03:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 966C43829BD2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f51.google.com with SMTP id e2so6846685wrc.1 for ; Fri, 27 May 2022 11:03:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aB9v3r4ALjyhligKH152BVUOWNyzIPs3XbG+ICv7Rzc=; b=z10/UD1qkIx3TDNE07nlg3SjmX6zwlKU/JgOJ+7OFZzL9khaD/WIK+bebl39CCmtKl HJotNnDwzLSeghcnmbWdqpvgcg6SmnpAfgHSxkuZ6c3otWocPEs7s1ZGi/n2AWFF1Vsf b4plgs7dZXvbHVMPFu/G87Gr1/CLFnkyuTmsaT72CPphFzXtsxO8/8jysxKO/St/OQiw 6TSSmbIEu58rOIHlewHkjEZPpL8LXULaANANw1lv8iazDv3+vGHEiUpdZtuMYo2l9m19 qiRXNc6C4Tw3lqhBpiKeGCPXLuRLO4g+30KD6uLRs2yFlyhsmlsr92Gv0+yp1+9xliQF 9Wxw== X-Gm-Message-State: AOAM532gxViwV0two/r/MtY5Hv/1lQSKgrYX4CxGUzc2uqC8dC2+VR8t buQDU5NQr3xeGhK9XrzhseXQXCpfVRg= X-Google-Smtp-Source: ABdhPJz3SZ71+VPMgPGvZ/WJdm466fo+vNBKCNAaDyzm/UukSo0Zb33UE4aVNH3QJECr0ouu4fd13A== X-Received: by 2002:a5d:5281:0:b0:20c:d5be:331c with SMTP id c1-20020a5d5281000000b0020cd5be331cmr35439714wrv.9.1653674580825; Fri, 27 May 2022 11:03:00 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id r7-20020a05600c35c700b003973e8a227dsm2901549wmq.46.2022.05.27.11.02.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 May 2022 11:02:59 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 3/7] Eliminate copy_location_spec Date: Fri, 27 May 2022 19:02:44 +0100 Message-Id: <20220527180248.2990723-4-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220527180248.2990723-1-pedro@palves.net> References: <20220527180248.2990723-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2022 18:03:04 -0000 copy_location_spec is just a wrapper around location_spec::clone(), so remove it and call clone() directly. This simplifies users, as they no longer have to use std::unique_ptr::get(). Change-Id: I8ce8658589460b98888283b306b315a5b8f73976 --- gdb/breakpoint.c | 10 +++++----- gdb/linespec.c | 3 +-- gdb/location.c | 8 -------- gdb/location.h | 4 ---- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index cdab60332ec..403b70067d7 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8422,8 +8422,9 @@ create_breakpoints_sal (struct gdbarch *gdbarch, /* Note that 'location' can be NULL in the case of a plain 'break', without arguments. */ location_spec_up locspec - = (canonical->locspec != NULL - ? copy_location_spec (canonical->locspec.get ()) : NULL); + = (canonical->locspec != nullptr + ? canonical->locspec->clone () + : nullptr); gdb::unique_xmalloc_ptr filter_string (lsal.canonical != NULL ? xstrdup (lsal.canonical) : NULL); @@ -8924,7 +8925,7 @@ create_breakpoint (struct gdbarch *gdbarch, { std::unique_ptr b = new_breakpoint_from_type (gdbarch, type_wanted); - b->locspec = copy_location_spec (locspec); + b->locspec = locspec->clone (); if (parse_extra) b->cond_string = NULL; @@ -12029,8 +12030,7 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch, for (size_t i = 0; i < lsal.sals.size (); i++) { - location_spec_up locspec - = copy_location_spec (canonical->locspec.get ()); + location_spec_up locspec = canonical->locspec->clone (); std::unique_ptr tp (new tracepoint (gdbarch, diff --git a/gdb/linespec.c b/gdb/linespec.c index 063944bb9a1..f992477b1d6 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -3083,8 +3083,7 @@ location_spec_to_sals (linespec_parser *parser, { addr = linespec_expression_to_pc (&addr_string); if (PARSER_STATE (parser)->canonical != NULL) - PARSER_STATE (parser)->canonical->locspec - = copy_location_spec (locspec); + PARSER_STATE (parser)->canonical->locspec = locspec->clone (); } else addr = addr_spec->address; diff --git a/gdb/location.c b/gdb/location.c index 4d0b60ff9c7..19b58ab4f5b 100644 --- a/gdb/location.c +++ b/gdb/location.c @@ -355,14 +355,6 @@ explicit_location_spec::to_linespec () const /* See description in location.h. */ -location_spec_up -copy_location_spec (const location_spec *src) -{ - return src->clone (); -} - -/* See description in location.h. */ - const char * location_spec_to_string (struct location_spec *locspec) { diff --git a/gdb/location.h b/gdb/location.h index f7e560aa26a..f52469d770f 100644 --- a/gdb/location.h +++ b/gdb/location.h @@ -297,10 +297,6 @@ const explicit_location_spec * explicit_location_spec * as_explicit_location_spec (location_spec *locspec); -/* Return a copy of the given SRC location spec. */ - -extern location_spec_up copy_location_spec (const location_spec *src); - /* Attempt to convert the input string in *ARGP into a location_spec. ARGP is advanced past any processed input. Always returns a non-nullptr location_spec unique pointer object. -- 2.36.0