From patchwork Fri Mar 23 20:55:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 26449 Received: (qmail 17660 invoked by alias); 23 Mar 2018 20:55:22 -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 17133 invoked by uid 89); 23 Mar 2018 20:55:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.47.144) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Mar 2018 20:55:18 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway22.websitewelcome.com (Postfix) with ESMTP id F188413544 for ; Fri, 23 Mar 2018 15:55:16 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id zTiWeDcEfA3CSzTiWeP6F8; Fri, 23 Mar 2018 15:55:16 -0500 Received: from 174-29-60-18.hlrn.qwest.net ([174.29.60.18]:33476 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1ezTiW-001cSz-Oc; Fri, 23 Mar 2018 15:55:16 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v3 06/13] Allow C-c to work in backtrace in more cases Date: Fri, 23 Mar 2018 14:55:05 -0600 Message-Id: <20180323205512.14434-7-tom@tromey.com> In-Reply-To: <20180323205512.14434-1-tom@tromey.com> References: <20180323205512.14434-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1ezTiW-001cSz-Oc X-Source-Sender: 174-29-60-18.hlrn.qwest.net (bapiya.Home) [174.29.60.18]:33476 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes PR cli/17716 notes that it is difficult to C-c (or "q" at a pagination prompt) while backtracing using a frame filter. One reason for this is that many places in py-framefilter.c use RETURN_MASK_ALL in a try/catch. This patch changes these spots to use RETURN_MASK_ERROR instead. This is safe to do because this entire file is exception safe now. gdb/ChangeLog 2018-03-23 Tom Tromey PR cli/17716: * python/py-framefilter.c (py_print_type, py_print_value) (enumerate_args, py_print_args, gdbpy_apply_frame_filter): Use RETURN_MASK_ERROR. --- gdb/ChangeLog | 7 +++++++ gdb/python/py-framefilter.c | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index dcac42df8e..28d5c37b25 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -215,7 +215,7 @@ py_print_type (struct ui_out *out, struct value *val) type_print (value_type (val), "", &stb, -1); out->field_stream ("type", stb); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -255,7 +255,7 @@ py_print_value (struct ui_out *out, struct value *val, { type = check_typedef (value_type (val)); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -282,7 +282,7 @@ py_print_value (struct ui_out *out, struct value *val, common_val_print (val, &stb, indent, opts, language); out->field_stream ("value", stb); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -497,7 +497,7 @@ enumerate_args (PyObject *iter, { annotate_frame_args (); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -553,7 +553,7 @@ enumerate_args (PyObject *iter, { read_frame_arg (sym, frame, &arg, &entryarg); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -586,7 +586,7 @@ enumerate_args (PyObject *iter, out->text (", "); out->wrap_hint (" "); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -622,7 +622,7 @@ enumerate_args (PyObject *iter, { out->text (", "); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -636,7 +636,7 @@ enumerate_args (PyObject *iter, { annotate_arg_end (); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -867,7 +867,7 @@ py_print_args (PyObject *filter, if (! out->is_mi_like_p ()) out->text (" ("); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -884,7 +884,7 @@ py_print_args (PyObject *filter, if (! out->is_mi_like_p ()) out->text (")"); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; @@ -1336,7 +1336,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, { gdbarch = get_frame_arch (frame); } - CATCH (except, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ERROR) { /* Let gdb try to print the stack trace. */ return EXT_LANG_BT_NO_FILTERS;