From patchwork Wed Nov 9 00:56:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 17330 Received: (qmail 81889 invoked by alias); 9 Nov 2016 00:56:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 81855 invoked by uid 89); 9 Nov 2016 00:56:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=collecting, 1687, strchr, agent X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Nov 2016 00:56:15 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8EB97F7D5 for ; Wed, 9 Nov 2016 00:56:13 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA90uC6p029178 for ; Tue, 8 Nov 2016 19:56:13 -0500 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH] agent_expr_up: gdb::unique_ptr -> std::unique_ptr Date: Wed, 9 Nov 2016 00:56:12 +0000 Message-Id: <1478652972-11094-1-git-send-email-palves@redhat.com> Now that we require C++11, use std::unique_ptr directly. This allows simplifying collection_list a bit by placing unique pointers in the vector directly, making the vector own its elements. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * ax-gdb.c (agent_eval_command_one): Use std::move instead of gdb::move. * ax.h (agent_expr_up): Use std::unique_ptr instead of gdb::unique_ptr. * breakpoint.c (parse_cond_to_aexpr): Use std::move instead of gdb::move. * tracepoint.c (collection_list::collect_symbol): Likewise. (collection_list::~collection_list): Delete. (encode_actions_1): Use std::move instead of gdb::move. (collection_list::add_aexpr): Use std::move instead of unique_ptr::release. * tracepoint.h (collection_list) <~collection_list>: Delete declaration. : Now a vector of unique_ptr. --- gdb/ax-gdb.c | 6 +++--- gdb/ax.h | 2 +- gdb/breakpoint.c | 4 ++-- gdb/tracepoint.c | 16 +++++----------- gdb/tracepoint.h | 4 +--- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 1816ba6..cd97585 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2555,7 +2555,7 @@ agent_eval_command_one (const char *exp, int eval, CORE_ADDR pc) arg = exp; if (!eval && strcmp (arg, "$_ret") == 0) { - agent = gdb::move (gen_trace_for_return_address (pc, get_current_arch (), + agent = std::move (gen_trace_for_return_address (pc, get_current_arch (), trace_string)); } else @@ -2565,10 +2565,10 @@ agent_eval_command_one (const char *exp, int eval, CORE_ADDR pc) if (eval) { gdb_assert (trace_string == 0); - agent = gdb::move (gen_eval_for_expr (pc, expr.get ())); + agent = std::move (gen_eval_for_expr (pc, expr.get ())); } else - agent = gdb::move (gen_trace_for_expr (pc, expr.get (), trace_string)); + agent = std::move (gen_trace_for_expr (pc, expr.get (), trace_string)); } ax_reqs (agent.get ()); diff --git a/gdb/ax.h b/gdb/ax.h index 85d2943..dbbfa0b 100644 --- a/gdb/ax.h +++ b/gdb/ax.h @@ -168,7 +168,7 @@ struct agent_expr }; /* An agent_expr owning pointer. */ -typedef gdb::unique_ptr agent_expr_up; +typedef std::unique_ptr agent_expr_up; /* The actual values of the various bytecode operations. */ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index a3a81f7..245e078 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2268,7 +2268,7 @@ parse_cond_to_aexpr (CORE_ADDR scope, struct expression *cond) that may show up. */ TRY { - aexpr = gdb::move (gen_eval_for_expr (scope, cond)); + aexpr = std::move (gen_eval_for_expr (scope, cond)); } CATCH (ex, RETURN_MASK_ERROR) @@ -2452,7 +2452,7 @@ parse_cmd_to_aexpr (CORE_ADDR scope, char *cmd) that may show up. */ TRY { - aexpr = gdb::move (gen_printf (scope, gdbarch, 0, 0, + aexpr = std::move (gen_printf (scope, gdbarch, 0, 0, format_start, format_end - format_start, fpieces, nargs, argvec)); } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 2a40b16..0cb12c7 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1076,7 +1076,7 @@ collection_list::collect_symbol (struct symbol *sym, } } - add_aexpr (gdb::move (aexpr)); + add_aexpr (std::move (aexpr)); } } @@ -1180,12 +1180,6 @@ collection_list::collection_list () m_aexprs.reserve (128); } -collection_list::~collection_list () -{ - for (int ndx = 0; ndx < m_aexprs.size (); ndx++) - delete m_aexprs[ndx]; -} - /* Reduce a collection list to string form (for gdb protocol). */ char ** @@ -1419,7 +1413,7 @@ encode_actions_1 (struct command_line *action, } } - collect->add_aexpr (gdb::move (aexpr)); + collect->add_aexpr (std::move (aexpr)); action_exp = strchr (action_exp, ','); /* more? */ } else if (0 == strncasecmp ("$_sdata", action_exp, 7)) @@ -1508,7 +1502,7 @@ encode_actions_1 (struct command_line *action, } } - collect->add_aexpr (gdb::move (aexpr)); + collect->add_aexpr (std::move (aexpr)); collect->append_exp (exp.get ()); break; } /* switch */ @@ -1538,7 +1532,7 @@ encode_actions_1 (struct command_line *action, /* Even though we're not officially collecting, add to the collect list anyway. */ - collect->add_aexpr (gdb::move (aexpr)); + collect->add_aexpr (std::move (aexpr)); } /* do */ } while (action_exp && *action_exp++ == ','); @@ -1602,7 +1596,7 @@ encode_actions_rsp (struct bp_location *tloc, char ***tdp_actions, void collection_list::add_aexpr (agent_expr_up aexpr) { - m_aexprs.push_back (aexpr.release ()); + m_aexprs.push_back (std::move (aexpr)); } static void diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index 7dfd8cc..87a74f9 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -243,7 +243,6 @@ class collection_list { public: collection_list (); - ~collection_list (); void add_wholly_collected (const char *print_name); @@ -282,8 +281,7 @@ private: std::vector m_memranges; - /* Vector owns pointers. */ - std::vector m_aexprs; + std::vector> m_aexprs; /* True is the user requested a collection of "$_sdata", "static tracepoint data". */