From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23021 invoked by alias); 26 May 2013 11:21:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23006 invoked by uid 89); 26 May 2013 11:21:40 -0000 X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,SPF_PASS autolearn=ham version=3.3.1 Received: from mail-pa0-f48.google.com (HELO mail-pa0-f48.google.com) (209.85.220.48) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sun, 26 May 2013 11:21:39 +0000 Received: by mail-pa0-f48.google.com with SMTP id kp6so5880343pab.35 for ; Sun, 26 May 2013 04:21:38 -0700 (PDT) X-Received: by 10.66.139.198 with SMTP id ra6mr25522626pab.140.1369567298045; Sun, 26 May 2013 04:21:38 -0700 (PDT) Received: from [192.168.1.101] ([219.82.151.177]) by mx.google.com with ESMTPSA id vu10sm24086590pbc.27.2013.05.26.04.21.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 May 2013 04:21:37 -0700 (PDT) Message-ID: <51A1F19C.1050009@gmail.com> Date: Sun, 26 May 2013 11:21:00 -0000 From: asmwarrior User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/17.0 Thunderbird/17.0a1 MIME-Version: 1.0 To: Tom Tromey CC: gdb-patches@sourceware.org Subject: Re: [PATCH 28/40] use explicit returns to avoid checker confusion References: <27ac4476e9e4f7a238ca9f86ec955ef6d2d21c02.1368124285.git.tromey@redhat.com> <519EBAE8.9030909@gmail.com> <87sj1d9nau.fsf@fleche.redhat.com> <87y5b48jwf.fsf@fleche.redhat.com> In-Reply-To: <87y5b48jwf.fsf@fleche.redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-05/txt/msg00943.txt.bz2 On 2013-5-24 23:41, Tom Tromey wrote: > Tom> I think the patch series needs to be rebased. This function's got > Tom> changed as part of the Python reference counting series. I'll fix it up > Tom> and re-send modified patches soon, probably next week. > > I rebased today and this was the only patch requiring a fix. > > Here is the new version. > > Tom > > * python/py-breakpoint.c (bppy_get_commands): Use > explicit, unconditional return. > * python/py-frame.c (frapy_read_var): Likewise. > * python/python.c (gdbpy_decode_line): Likewise. > > diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c > index eaa1bc5..87f1fdc 100644 > --- a/gdb/python/py-breakpoint.c > +++ b/gdb/python/py-breakpoint.c > @@ -492,7 +492,8 @@ bppy_get_commands (PyObject *self, void *closure) > if (except.reason < 0) > { > do_cleanups (chain); > - GDB_PY_HANDLE_EXCEPTION (except); > + gdbpy_convert_exception (except); > + return NULL; > } > > cmdstr = ui_file_xstrdup (string_file, &length); > diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c > index 2615ddf..f960b08 100644 > --- a/gdb/python/py-frame.c > +++ b/gdb/python/py-frame.c > @@ -477,7 +477,8 @@ frapy_read_var (PyObject *self, PyObject *args) > if (except.reason < 0) > { > do_cleanups (cleanup); > - GDB_PY_HANDLE_EXCEPTION (except); > + gdbpy_convert_exception (except); > + return NULL; > } > > if (!var) > diff --git a/gdb/python/python.c b/gdb/python/python.c > index 690534f..c94198e 100644 > --- a/gdb/python/python.c > +++ b/gdb/python/python.c > @@ -653,7 +653,8 @@ gdbpy_decode_line (PyObject *self, PyObject *args) > { > do_cleanups (cleanups); > /* We know this will always throw. */ > - GDB_PY_HANDLE_EXCEPTION (except); > + gdbpy_convert_exception (except); > + return NULL; > } > > if (sals.nelts) Thanks, with this patch, there is no build failure now. Yuanhui Zhang