From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 407323858D1E; Fri, 10 Mar 2023 11:36:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 407323858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678448192; bh=ZnhCq69GxCeQC3QagBO7Ep41ZPj+i1L5qh6nSwvc//4=; h=From:To:Subject:Date:From; b=UF+W4zJYLa0+EWxpr6ZTAOAlvlvGH6M6as7EaUePLob0dt/O55JwM1ljUKCS5fjh8 8QGsOz8Va6I504VaStRU81N89V0ceHg1jd1nnWQQm9oZgtAwiWVA39HaGoCkf84UYg 2n2OPaGyj3B0c/5sNxvIv/S6s/ICToIOVFiSCn0g= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-6579] libstdc++: Fix GDB Xmethod for std::shared_ptr::use_count() [PR109064] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e3f8dfcd885d19d322b10fb4e36d50b60da2576b X-Git-Newrev: 37c8a083d44f8123ad81a3cd411389b0b7b42ae6 Message-Id: <20230310113632.407323858D1E@sourceware.org> Date: Fri, 10 Mar 2023 11:36:32 +0000 (GMT) List-Id: https://gcc.gnu.org/g:37c8a083d44f8123ad81a3cd411389b0b7b42ae6 commit r13-6579-g37c8a083d44f8123ad81a3cd411389b0b7b42ae6 Author: Jonathan Wakely Date: Fri Mar 10 11:06:25 2023 +0000 libstdc++: Fix GDB Xmethod for std::shared_ptr::use_count() [PR109064] libstdc++-v3/ChangeLog: PR libstdc++/109064 * python/libstdcxx/v6/xmethods.py (SharedPtrUseCountWorker): Remove self-recursion in __init__. Add missing _supports. * testsuite/libstdc++-xmethods/shared_ptr.cc: Check use_count() and unique(). Diff: --- libstdc++-v3/python/libstdcxx/v6/xmethods.py | 5 ++++- libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py index 6af7a3dcfe3..18a165f425e 100644 --- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py +++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py @@ -730,7 +730,7 @@ class SharedPtrUseCountWorker(gdb.xmethod.XMethodWorker): "Implements std::shared_ptr::use_count()" def __init__(self, elem_type): - SharedPtrUseCountWorker.__init__(self, elem_type) + pass def get_arg_types(self): return None @@ -738,6 +738,9 @@ class SharedPtrUseCountWorker(gdb.xmethod.XMethodWorker): def get_result_type(self, obj): return gdb.lookup_type('long') + def _supports(self, method_name): + return True + def __call__(self, obj): refcounts = obj['_M_refcount']['_M_pi'] return refcounts['_M_use_count'] if refcounts else 0 diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc index c89f1d05aa3..c228d3ad26c 100644 --- a/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc @@ -37,6 +37,8 @@ main () std::shared_ptr s(new x_struct[2]{ {92}, {115} }); + auto qq = q; + // { dg-final { note-test *p 10 } } // { dg-final { regexp-test p.get() 0x.* } } @@ -67,6 +69,11 @@ main () // { dg-final { whatis-test s.get() "x_struct \*" } } // { dg-final { whatis-test s\[1].y int } } +// { dg-final { note-test p.use_count() 1 } } +// { dg-final { note-test p.unique() true } } +// { dg-final { note-test q.use_count() 2 } } +// { dg-final { note-test q.unique() false } } + return 0; // Mark SPOT }