From patchwork Sat Nov 12 21:28:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17429 Received: (qmail 57258 invoked by alias); 12 Nov 2016 21:29:07 -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 57199 invoked by uid 89); 12 Nov 2016 21:29:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=varobj, interpreter, our X-HELO: gproxy5-pub.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5-pub.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Sat, 12 Nov 2016 21:28:57 +0000 Received: (qmail 31255 invoked by uid 0); 12 Nov 2016 21:28:55 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy5.mail.unifiedlayer.com with SMTP; 12 Nov 2016 21:28:55 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id 79Us1u00m2f2jeq019Uv03; Sat, 12 Nov 2016 14:28:55 -0700 X-Authority-Analysis: v=2.1 cv=fZg+lSgF c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=FvcjyVspwKOxuImyfE4A:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 97-118-168-190.hlrn.qwest.net ([97.118.168.190]:47378 helo=bapiya.localdomain) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c5fr2-0006jl-LA; Sat, 12 Nov 2016 14:28:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 08/11] Remove ensure_python_env Date: Sat, 12 Nov 2016 14:28:42 -0700 Message-Id: <1478986125-15122-9-git-send-email-tom@tromey.com> In-Reply-To: <1478986125-15122-1-git-send-email-tom@tromey.com> References: <1478986125-15122-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c5fr2-0006jl-LA X-Source-Sender: 97-118-168-190.hlrn.qwest.net (bapiya.localdomain) [97.118.168.190]:47378 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== All of gdb has been converted away from ensure_python_env and varobj_ensure_python_env now; so remove them. 2016-11-12 Tom Tromey * python/python.c (ensure_python_env, restore_python_env): Remove. * python/python-internal.h (ensure_python_env): Don't declare. * varobj.h (varobj_ensure_python_env): Don't declare. * varobj.c (varobj_ensure_python_env): Remove. --- gdb/ChangeLog | 8 ++++++++ gdb/python/python-internal.h | 3 --- gdb/python/python.c | 23 ----------------------- gdb/varobj.c | 8 -------- gdb/varobj.h | 2 -- 5 files changed, 8 insertions(+), 36 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index be7ce38..760bb9c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2016-11-12 Tom Tromey + * python/python.c (ensure_python_env, restore_python_env): + Remove. + * python/python-internal.h (ensure_python_env): Don't declare. + * varobj.h (varobj_ensure_python_env): Don't declare. + * varobj.c (varobj_ensure_python_env): Remove. + +2016-11-12 Tom Tromey + * varobj.c (varobj_value_get_print_value): Use gdbpy_enter_varobj. diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index d167251..fdbff30 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -535,9 +535,6 @@ class gdbpy_enter_varobj : public gdbpy_enter }; -struct cleanup *ensure_python_env (struct gdbarch *gdbarch, - const struct language_defn *language); - extern struct gdbarch *python_gdbarch; extern const struct language_defn *python_language; diff --git a/gdb/python/python.c b/gdb/python/python.c index 59fa9e1..2bfe67f 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -241,29 +241,6 @@ gdbpy_enter::~gdbpy_enter () restore_active_ext_lang (m_previous_active); } -static void -restore_python_env (void *p) -{ - gdbpy_enter *env = (gdbpy_enter *) p; - - delete env; -} - -/* Called before entering the Python interpreter to install the - current language and architecture to be used for Python values. - Also set the active extension language for GDB so that SIGINT's - are directed our way, and if necessary install the right SIGINT - handler. */ - -struct cleanup * -ensure_python_env (struct gdbarch *gdbarch, - const struct language_defn *language) -{ - gdbpy_enter *env = new gdbpy_enter (gdbarch, language); - - return make_cleanup (restore_python_env, env); -} - /* Set the quit flag. */ static void diff --git a/gdb/varobj.c b/gdb/varobj.c index deebe08..4580b87 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -226,14 +226,6 @@ is_root_p (const struct varobj *var) } #ifdef HAVE_PYTHON -/* Helper function to install a Python environment suitable for - use during operations on VAR. */ -struct cleanup * -varobj_ensure_python_env (const struct varobj *var) -{ - return ensure_python_env (var->root->exp->gdbarch, - var->root->exp->language_defn); -} /* See python-internal.h. */ gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var) diff --git a/gdb/varobj.h b/gdb/varobj.h index df5c6cb..3ecf071 100644 --- a/gdb/varobj.h +++ b/gdb/varobj.h @@ -320,8 +320,6 @@ extern int varobj_has_more (const struct varobj *var, int to); extern int varobj_is_dynamic_p (const struct varobj *var); -extern struct cleanup *varobj_ensure_python_env (const struct varobj *var); - extern int varobj_default_value_is_changeable_p (const struct varobj *var); extern int varobj_value_is_changeable_p (const struct varobj *var);