From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4779 invoked by alias); 20 Oct 2011 12:58:33 -0000 Received: (qmail 4762 invoked by uid 22791); 20 Oct 2011 12:58:30 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 20 Oct 2011 12:58:10 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9KCw9pm028462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Oct 2011 08:58:10 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9KCw7ox005691; Thu, 20 Oct 2011 08:58:08 -0400 From: Phil Muldoon To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [patch] [python] Use TRY_CATCH in some functions. References: Reply-to: pmuldoon@redhat.com X-URL: http://www.redhat.com Date: Thu, 20 Oct 2011 13:03:00 -0000 In-Reply-To: (Tom Tromey's message of "Tue, 11 Oct 2011 10:41:27 -0600") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-IsSubscribed: yes 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 X-SW-Source: 2011-10/txt/msg00553.txt.bz2 Tom Tromey writes: > Phil> @@ -624,20 +625,31 @@ typy_lookup_type (struct demangle_component *demangled, > [...] > > Phil> + if (except.reason < 0) > Phil> + { > Phil> + PyErr_Format (except.reason == RETURN_QUIT > Phil> + ? PyExc_KeyboardInterrupt : PyExc_RuntimeError, > Phil> + "%s", except.message); > Phil> + return NULL; > > Why not GDB_PY_HANDLE_EXCEPTION here? > (And also fix up typy_lookup_typename to do the same.) Because typy_lookup_typename and typy_lookup_type are helper functions that return struct type, while GDB_PY_HANDLE_EXCEPTION returns a PyObject (from gdbpy_convert_exception). Should we have a macro that builds an exception without returning one? We should, I think. But I was not going to do that in this patch context. > Phil> @@ -990,8 +1002,16 @@ typy_richcompare (PyObject *self, PyObject *other, int op) > [...] > Phil> + { > Phil> + bcache_xfree (cache); > Phil> + VEC_free (type_equality_entry_d, worklist); > Phil> + GDB_PY_HANDLE_EXCEPTION (except); > > I think the freeing should be hoisted above the exception check, to > consolidate the code. With the current patch the code is duplicated on > both branches. I amended the logic to look like this: @@ -1007,11 +1007,13 @@ { result = check_types_worklist (&worklist, cache); } - if (except.reason < 0) - result = Py_NE; - + /* check_types_worklist calls several nested Python helper + functions, some of which can raise a GDB Exception, so we + just check and convert here. If there is a GDB exception, a + comparison is not capable (or trusted), so exit. */ bcache_xfree (cache); VEC_free (type_equality_entry_d, worklist); + GDB_PY_HANDLE_EXCEPTION (except); } if (op == result) Cheers, Phil