From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8169 invoked by alias); 13 Apr 2011 14:26:11 -0000 Received: (qmail 8137 invoked by uid 22791); 13 Apr 2011 14:26:09 -0000 X-SWARE-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD 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; Wed, 13 Apr 2011 14:26:00 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3DEQ0Dv011480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Apr 2011 10:26:00 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p3DEPwaK025012 for ; Wed, 13 Apr 2011 10:25:59 -0400 From: Phil Muldoon To: gdb-patches@sourceware.org Subject: [patch] [python] mi/12531 Reply-to: pmuldoon@redhat.com X-URL: http://www.redhat.com Date: Wed, 13 Apr 2011 14:26:00 -0000 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-04/txt/msg00185.txt.bz2 This patch fixes a case where an MI user could install a visualizer on a synthetic varobj. If we detect that the object is a CPLUS_FAKE_CHILD, we do not install a visualizer. I thought about raising an error, but other MI behavior with fake children is just to move on if possible. I did the same. Cheers Phil -- 2011-04-13 Phil Muldoon * varobj.c (install_default_visualizer): Do not install a visualizer if the varobj is CPLUS_FAKE_CHILD. (construct_visualizer): Likewise. 2011-04-13 Phil Muldoon * gdb.python/py-mi.exp: Add CPLUS_FAKE_CHILD tests and a C++ compile target. * gdb.python/py-prettyprint.exp: Add C++ object for CPLUS_FAKE_CHILD test. -- diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index 629417b..2adb449 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -283,4 +283,42 @@ mi_list_varobj_children nstype2 { { {nstype2.} {} 6 {char \[6\]} } } "list children after setting exception flag" +# C++ MI tests +gdb_exit +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ additional_flags=-DMI}] != "" } { + untested "Couldn't compile ${srcfile} in c++ mode" + return -1 + } + +if [mi_gdb_start] { + continue +} +mi_delete_breakpoints +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} + +if {[lsearch -exact [mi_get_features] python] < 0} { + unsupported "python support is disabled" + return -1 +} + +mi_runto main +mi_continue_to_line [gdb_get_line_number {break to inspect struct and union} ${testfile}.c] \ + "step to breakpoint" + +# Test python/12531. Install visualizer on a cplus_fake_child. +mi_create_varobj fake fake \ + "create fake varobj" + +mi_list_varobj_children fake { + { fake.private private 1 } +} "list children of fake" + +mi_list_varobj_children fake.private { + { fake.private.sname sname 2 std::string } +} "list children fake.private" + +mi_gdb_test "-var-set-visualizer fake.private gdb.default_visualizer" \ + "\\^done" "Install visualizer on a cplus_fake_child" + remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-prettyprint.c b/gdb/testsuite/gdb.python/py-prettyprint.c index 5f98433..0b6d216 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.c +++ b/gdb/testsuite/gdb.python/py-prettyprint.c @@ -45,6 +45,8 @@ struct lazystring { }; #ifdef __cplusplus +#include + struct S : public s { int zs; }; @@ -90,6 +92,16 @@ class Derived : public Vbase1, public Vbase2, public Vbase3 } }; +class Fake +{ + std::string sname; + + public: + Fake (const std::string& name = ""): + sname (name) + { + } +}; #endif struct substruct { @@ -262,6 +274,7 @@ main () Derived derived; + Fake fake ("foo"); #endif add_item (&c, 23); /* MI breakpoint here */ diff --git a/gdb/varobj.c b/gdb/varobj.c index bfb3851..1c4c88f 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -1397,6 +1397,11 @@ install_visualizer (struct varobj *var, PyObject *constructor, static void install_default_visualizer (struct varobj *var) { + + /* Do not install a visualizer on a CPLUS_FAKE_CHILD. */ + if (CPLUS_FAKE_CHILD (var)) + return; + if (pretty_printing) { PyObject *pretty_printer = NULL; @@ -1429,6 +1434,10 @@ construct_visualizer (struct varobj *var, PyObject *constructor) { PyObject *pretty_printer; + /* Do not install a visualizer on a CPLUS_FAKE_CHILD. */ + if (CPLUS_FAKE_CHILD (var)) + return; + Py_INCREF (constructor); if (constructor == Py_None) pretty_printer = NULL;