From patchwork Wed Aug 27 21:39:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Chandra X-Patchwork-Id: 383574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9F53A14009B for ; Thu, 28 Aug 2014 07:39:13 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; q=dns; s=default; b=jPLyQc5mA8jQueJnVfZlIVfIeNr1Mp3niyNkN9s79/7 4FNVenX6w3Q+LbBMGc5goFr46gUWchEZnI/pu9tfW+S2UaxTF2Jjb6IPWCuibQLW uMn5rmgjeJGPIHmkMpp7uhhRhQKHljl25IhbMbaGwFSbQUVM3pvpBZw4FzuwBcmI = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; s=default; bh=As10x7u/JDrmfw/ZULVOzm0PoaA=; b=dmFu/XzIi7VZbRxgy s3kIvq6IoaHPDLenzDNqlaNE4FO/SI2o1pmdY1xf9z5kb9OVHhAGk7fLM86429+l J/pAdJYHVBBe5L6yQBET8UBtCG40Es9ZkGvynTxFizwYx+UZhBzloDZk9GfjSTwX n5tAsvdOcTqxqTp46wqL7Wr77o= Received: (qmail 531 invoked by alias); 27 Aug 2014 21:39:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 515 invoked by uid 89); 27 Aug 2014 21:39:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f171.google.com Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 27 Aug 2014 21:39:03 +0000 Received: by mail-ob0-f171.google.com with SMTP id wm4so705893obc.30 for ; Wed, 27 Aug 2014 14:39:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc :content-type; bh=kdhg7o2Hl74ZJZ6+t7Fe/TlXMvbWcb7Al2GXzG0nOKg=; b=SQk4cCNxra3AhdYDswr1g0QGG0p6Kw640u7bPm7ReDC8iFPVd1+bKQVQUVgx+vxDag infvUDADegRG5XdLET5F0hTT1GpvOZxPfWxEeb4MNh05z8DM0IdEshTEUrJFdgjKgRKQ K8UtCZ+TgQnuuR0vYm6JeWa+ryMfqJyXXP/MrRmNJOmj2Eg/ux2c16a/HZLAPs+8UNiM ZAf/oeuR4+c0BGD/zBdpXqISobXerIMZowIUykZ0LYPwC1p/nqERCL6X04FWPWWPkp3J 1Nwa/hTXctMmrEQmqrRLvY8MJEDiWpOcz9Wz8rXFK9AXAVGtgrm5rUSSCpMCIn7BKGPH zuqw== X-Gm-Message-State: ALoCoQnWIMKsdmCySwyrzg9+8NxHboFPJF3l2qluARXsN+PFVueEJHzsVXcFOLZh4sY0r/IRuj+D MIME-Version: 1.0 X-Received: by 10.182.52.165 with SMTP id u5mr36567384obo.30.1409175541491; Wed, 27 Aug 2014 14:39:01 -0700 (PDT) Received: by 10.202.225.135 with HTTP; Wed, 27 Aug 2014 14:39:01 -0700 (PDT) Date: Wed, 27 Aug 2014 14:39:01 -0700 Message-ID: Subject: [PATCH libstdc++ v5] - Add xmethods for std::vector and std::unique_ptr From: Siva Chandra To: gcc-patches , "libstdc++" Cc: Jonathan Wakely , Doug Evans X-IsSubscribed: yes The attached patch addresses Jonathan Wakely's comments on the previous version of the patch: https://gcc.gnu.org/ml/gcc-patches/2014-08/msg02426.html On Tue, Aug 26, 2014 at 10:58 AM, Jonathan Wakely wrote: > Shouldn't there be a change to python/Makefile.am so that xmethods.py > gets installed alongside printers.py? Otherwise you can use these new > xmethods in the libstdc++ testssuite, but they're not available to > users. Ah, sorry I missed that. Added in the attached patch. > I'd also expect something to call the register_libstdcxx_xmethods > function automatically, as in the attached patch, although this > doesn't work for me. gdb.xmethod is a module. Hence, hasattr(gdb, 'xmethod') in your suggestion will not return True. I have modified this in the attached patch to something which should work. I had something in hook.in in my very first patch but Tom Tromey said it was not required anymore: https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02405.html > How am I expected to use these xmethods? If you use the * operator on a unique_ptr or [] operator on a vector in GDB, the xmethods will be called. Without the xmethods, GDB will print something like "No matching method for unique_ptr<...>::operator* found" if those operators were not used in the source. ChangeLog: 2014-08-27 Siva Chandra Reddy * python/hook.in: Load the xmethods. * python/Makefile.am (nobase_python_DATA): Add xmethods.py. * python/Makefile.in: Regenerated. * python/libstdcxx/v6/xmethods.py: New file. * testsuite/lib/gdb-test.exp (gdb_version_check_xmethods): New function. (gdb-test): New optional argument LOAD_XMETHODS. Load xmethods python script if LOAD_XMETHODS is true. * testsuite/libstdc++-xmethods/unique_ptr.cc: New file. * testsuite/libstdc++-xmethods/vector.cc: New file. * testsuite/libstdc++-xmethods/xmethods.exp: New file. diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am index ac7341a..c34c860 100644 --- a/libstdc++-v3/python/Makefile.am +++ b/libstdc++-v3/python/Makefile.am @@ -33,6 +33,7 @@ all-local: gdb.py nobase_python_DATA = \ libstdcxx/v6/printers.py \ + libstdcxx/v6/xmethods.py \ libstdcxx/v6/__init__.py \ libstdcxx/__init__.py diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 21d74a90..7d0c8ac 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -316,6 +316,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) @ENABLE_PYTHONDIR_TRUE@pythondir = $(prefix)/$(python_mod_dir) nobase_python_DATA = \ libstdcxx/v6/printers.py \ + libstdcxx/v6/xmethods.py \ libstdcxx/v6/__init__.py \ libstdcxx/__init__.py diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in index 3620523..aeb1cdb 100644 --- a/libstdc++-v3/python/hook.in +++ b/libstdc++-v3/python/hook.in @@ -58,3 +58,15 @@ if gdb.current_objfile () is not None: # Load the pretty-printers. from libstdcxx.v6.printers import register_libstdcxx_printers register_libstdcxx_printers (gdb.current_objfile ()) + +# Load the xmethods if GDB supports them. +def gdb_has_xmethods(): + try: + import gdb.xmethod + return True + except ImportError: + return False + +if gdb_has_xmethods(): + from libstdcxx.v6.xmethods import register_libstdcxx_xmethods + register_libstdcxx_xmethods (gdb.current_objfile ()) diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py new file mode 100644 index 0000000..f20f411 --- /dev/null +++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py @@ -0,0 +1,103 @@ +# Xmethods for libstc++. + +# Copyright (C) 2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import gdb +import gdb.xmethod +import re + +matcher_name_prefix = 'libstdc++::' + +# Xmethods for std::vector + +class VectorSizeWorker(gdb.xmethod.XMethodWorker): + def __init__(self): + self.name = 'size' + self.enabled = True + + def get_arg_types(self): + return None + + def __call__(self, obj): + return obj['_M_impl']['_M_finish'] - obj['_M_impl']['_M_start'] + +class VectorSubscriptWorker(gdb.xmethod.XMethodWorker): + def __init__(self): + self.name = 'operator[]' + self.enabled = True + + def get_arg_types(self): + return gdb.lookup_type('std::size_t') + + def __call__(self, obj, subscript): + return obj['_M_impl']['_M_start'][subscript] + +class VectorMethodsMatcher(gdb.xmethod.XMethodMatcher): + def __init__(self): + gdb.xmethod.XMethodMatcher.__init__(self, + matcher_name_prefix + 'vector') + self._subscript_worker = VectorSubscriptWorker() + self._size_worker = VectorSizeWorker() + self.methods = [self._subscript_worker, self._size_worker] + + def match(self, class_type, method_name): + if not re.match('^std::vector<.*>$', class_type.tag): + return None + if method_name == 'operator[]' and self._subscript_worker.enabled: + return self._subscript_worker + elif method_name == 'size' and self._size_worker.enabled: + return self._size_worker + +# Xmethods for std::unique_ptr + +class UniquePtrGetWorker(gdb.xmethod.XMethodWorker): + def __init__(self): + self.name = 'get' + self.enabled = True + + def get_arg_types(self): + return None + + def __call__(self, obj): + return obj['_M_t']['_M_head_impl'] + +class UniquePtrDerefWorker(UniquePtrGetWorker): + def __init__(self): + UniquePtrGetWorker.__init__(self) + self.name = 'operator*' + + def __call__(self, obj): + return UniquePtrGetWorker.__call__(self, obj).dereference() + +class UniquePtrMethodsMatcher(gdb.xmethod.XMethodMatcher): + def __init__(self): + gdb.xmethod.XMethodMatcher.__init__(self, + matcher_name_prefix + 'unique_ptr') + self._get_worker = UniquePtrGetWorker() + self._deref_worker = UniquePtrDerefWorker() + self.methods = [self._get_worker, self._deref_worker] + + def match(self, class_type, method_name): + if not re.match('^std::unique_ptr<.*>$', class_type.tag): + return None + if method_name == 'operator*' and self._deref_worker.enabled: + return self._deref_worker + elif method_name == 'get' and self._get_worker.enabled: + return self._get_worker + +def register_libstdcxx_xmethods(locus): + gdb.xmethod.register_xmethod_matcher(locus, VectorMethodsMatcher()) + gdb.xmethod.register_xmethod_matcher(locus, UniquePtrMethodsMatcher()) diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp index 9cb6ecf..1a68217 100644 --- a/libstdc++-v3/testsuite/lib/gdb-test.exp +++ b/libstdc++-v3/testsuite/lib/gdb-test.exp @@ -79,7 +79,7 @@ proc whatis-test {var result} { # # Argument 0 is the marker on which to put a breakpoint # Argument 2 handles expected failures and the like -proc gdb-test { marker {selector {}} } { +proc gdb-test { marker {selector {}} {load_xmethods 0} } { if { ![isnative] || [is_remote target] } { return } if {[string length $selector] > 0} { @@ -111,7 +111,8 @@ proc gdb-test { marker {selector {}} } { set cmd_file "[file rootname [file tail $prog]].gdb" global srcdir - set pycode [file join $srcdir .. python libstdcxx v6 printers.py] + set printer_code [file join $srcdir .. python libstdcxx v6 printers.py] + set xmethod_code [file join $srcdir .. python libstdcxx v6 xmethods.py] global gdb_tests @@ -121,8 +122,13 @@ proc gdb-test { marker {selector {}} } { # Now that we've disabled auto-load, it's safe to set the target file puts $fd "file ./$output_file" # Load & register *our* copy of the pretty-printers - puts $fd "source $pycode" + puts $fd "source $printer_code" puts $fd "python register_libstdcxx_printers(None)" + if { $load_xmethods } { + # Load a& register xmethods. + puts $fd "source $xmethod_code" + puts $fd "python register_libstdcxx_xmethods(None)" + } # And start the program puts $fd "break $line" puts $fd "run" @@ -262,3 +268,12 @@ proc gdb_version_check {} { return [gdb_batch_check "python print(gdb.lookup_global_symbol)" \ ""] } + +# Check for a version of gdb which supports xmethod tests. It is done +# in a manner similar to the check for a version of gdb which supports the +# pretty-printer tests below. +proc gdb_version_check_xmethods {} { + return [gdb_batch_check \ + "python import gdb.xmethod; print(gdb.xmethod.XMethod)" \ + ""] +} diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/unique_ptr.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/unique_ptr.cc new file mode 100644 index 0000000..6c9fd8e --- /dev/null +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/unique_ptr.cc @@ -0,0 +1,36 @@ +// { dg-do run } +// { dg-options "-std=gnu++11 -g -O0" } + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +int +main () +{ + int *i = new int; + *i = 10; + + std::unique_ptr p(i); +// { dg-final { note-test *p 10 } } +// { dg-final { regexp-test p.get() 0x.* } } + + return 0; // Mark SPOT +} + +// { dg-final { gdb-test SPOT {} 1 } } diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/vector.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/vector.cc new file mode 100644 index 0000000..2ee9399 --- /dev/null +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/vector.cc @@ -0,0 +1,38 @@ +// { dg-do run } +// { dg-options "-g -O0" } + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +int +main () +{ + std::vector v; + v.push_back(1); + v.push_back(2); + v.push_back(3); +// { dg-final { note-test v\[0\] 1 } } +// { dg-final { note-test v\[1\] 2 } } +// { dg-final { note-test v\[2\] 3 } } +// { dg-final { note-test v.size() 3 } } + + return 0; // Mark SPOT +} + +// { dg-final { gdb-test SPOT {} 1 } } diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp new file mode 100644 index 0000000..c51c7e8 --- /dev/null +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp @@ -0,0 +1,51 @@ +# Copyright (C) 2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING3. If not see +# . + +load_lib gdb-test.exp + +dg-init +v3-build_support + +global GDB +if ![info exists ::env(GUALITY_GDB_NAME)] { + if [info exists GDB] { + set guality_gdb_name "$GDB" + } else { + set guality_gdb_name "[transform gdb]" + } + setenv GUALITY_GDB_NAME "$guality_gdb_name" +} + +if {! [gdb_version_check_xmethods]} { + unsupported "xmethods.exp" + return +} + +# This can be used to keep the .exe around. dg-test has an option for +# this but there is no way to pass it through dg-runtest. +global dg-interpreter-batch-mode +set dg-interpreter-batch-mode 1 + +global DEFAULT_CXXFLAGS +global PCH_CXXFLAGS +dg-runtest [lsort [glob $srcdir/$subdir/*.cc]] \ + "" "$DEFAULT_CXXFLAGS $PCH_CXXFLAGS" + +if [info exists guality_gdb_name] { + unsetenv GUALITY_GDB_NAME +} + +dg-finish