From patchwork Fri Apr 14 02:23:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 20045 Received: (qmail 5829 invoked by alias); 14 Apr 2017 02:42:25 -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 5136 invoked by uid 89); 14 Apr 2017 02:42:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:67.222.38.55, H*RU:sk:gproxy5, HX-HELO:sk:gproxy5, Hx-spam-relays-external:sk:gproxy5 X-HELO: gproxy5.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 14 Apr 2017 02:42:22 +0000 Received: from cmgw2 (unknown [10.0.90.83]) by gproxy5.mail.unifiedlayer.com (Postfix) with ESMTP id 782DA1411C8 for ; Thu, 13 Apr 2017 20:23:47 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id 82Pk1v0022f2jeq012PnHC; Thu, 13 Apr 2017 20:23:47 -0600 X-Authority-Analysis: v=2.2 cv=LIwWeNe9 c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=AzvcPWV-tVgA:10 a=zstS-IiYAAAA:8 a=bALSNDsv6UPE9DLTr3QA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-65-226.hlrn.qwest.net ([75.166.65.226]:57026 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1cyqtj-0007Yc-OS; Thu, 13 Apr 2017 20:23:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 4/5] Use ui_out_emit_tuple in more places in MI Date: Thu, 13 Apr 2017 20:23:36 -0600 Message-Id: <20170414022337.28368-5-tom@tromey.com> In-Reply-To: <20170414022337.28368-1-tom@tromey.com> References: <20170414022337.28368-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1cyqtj-0007Yc-OS X-Source-Sender: 75-166-65-226.hlrn.qwest.net (bapiya.Home) [75.166.65.226]:57026 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This patch changes a few more spots in MI to use ui_out_emit_tuple. These changes required the use of gdb::optional. gdb/ChangeLog 2017-04-13 Tom Tromey * mi/mi-main.c (print_variable_or_computed): Use ui_out_emit_tuple. * mi/mi-cmd-var.c (varobj_update_one): Use ui_out_emit_tuple. * mi/mi-cmd-stack.c (list_arg_or_local): Use ui_out_emit_tuple. --- gdb/ChangeLog | 6 ++++++ gdb/mi/mi-cmd-stack.c | 9 +++------ gdb/mi/mi-cmd-var.c | 7 +++---- gdb/mi/mi-main.c | 7 ++----- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba91cdc..e972b4c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-04-13 Tom Tromey + * mi/mi-main.c (print_variable_or_computed): Use ui_out_emit_tuple. + * mi/mi-cmd-var.c (varobj_update_one): Use ui_out_emit_tuple. + * mi/mi-cmd-stack.c (list_arg_or_local): Use ui_out_emit_tuple. + +2017-04-13 Tom Tromey + * tracepoint.c (tvariables_info_1) (print_one_static_tracepoint_marker): Use ui_out_emit_tuple. diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index f288817..bd24e5b 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -34,6 +34,7 @@ #include "extension.h" #include #include "mi-parse.h" +#include "common/gdb_optional.h" enum what_to_list { locals, arguments, all }; @@ -483,7 +484,6 @@ static void list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, enum print_values values, int skip_unavailable) { - struct cleanup *old_chain; struct ui_out *uiout = current_uiout; gdb_assert (!arg->val || !arg->error); @@ -507,10 +507,9 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, TYPE_LENGTH (value_type (arg->val)))))) return; - old_chain = make_cleanup (null_cleanup, NULL); - + gdb::optional tuple_emitter; if (values != PRINT_NO_VALUES || what == all) - make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + tuple_emitter.emplace (uiout, nullptr); string_file stb; @@ -556,8 +555,6 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, stb.printf (_(""), error_message); uiout->field_stream ("value", stb); } - - do_cleanups (old_chain); } /* Print a list of the objects for the frame FI in a certain form, diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 0a4ed62..1a7e322 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -30,6 +30,7 @@ #include "mi-getopt.h" #include "gdbthread.h" #include "mi-parse.h" +#include "common/gdb_optional.h" extern unsigned int varobjdebug; /* defined in varobj.c. */ @@ -712,10 +713,10 @@ varobj_update_one (struct varobj *var, enum print_values print_values, for (i = 0; VEC_iterate (varobj_update_result, changes, i, r); ++i) { int from, to; - struct cleanup *cleanup = make_cleanup (null_cleanup, NULL); + gdb::optional tuple_emitter; if (mi_version (uiout) > 1) - make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + tuple_emitter.emplace (uiout, nullptr); uiout->field_string ("name", varobj_get_objname (r->varobj)); switch (r->status) @@ -784,8 +785,6 @@ varobj_update_one (struct varobj *var, enum print_values print_values, VEC_free (varobj_p, r->newobj); r->newobj = NULL; /* Paranoia. */ } - - do_cleanups (cleanup); } VEC_free (varobj_update_result, changes); } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index d309ba3..7e225db 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -2656,7 +2656,6 @@ mi_cmd_ada_task_info (const char *command, char **argv, int argc) static void print_variable_or_computed (const char *expression, enum print_values values) { - struct cleanup *old_chain; struct value *val; struct type *type; struct ui_out *uiout = current_uiout; @@ -2670,9 +2669,9 @@ print_variable_or_computed (const char *expression, enum print_values values) else val = evaluate_expression (expr.get ()); - old_chain = make_cleanup (null_cleanup, NULL); + gdb::optional tuple_emitter; if (values != PRINT_NO_VALUES) - make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + tuple_emitter.emplace (uiout, nullptr); uiout->field_string ("name", expression); switch (values) @@ -2704,8 +2703,6 @@ print_variable_or_computed (const char *expression, enum print_values values) } break; } - - do_cleanups (old_chain); } /* Implement the "-trace-frame-collected" command. */