From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Fix GDB Xmethod for std::shared_ptr::use_count() [PR109064]
Date: Fri, 10 Mar 2023 11:37:18 +0000 [thread overview]
Message-ID: <20230310113718.2304961-1-jwakely@redhat.com> (raw)
Tested x86_64-linux (GDB 13.1).
Pushed to trunk for now, will do backports too.
-- >8 --
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().
---
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<T>::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<x_struct[3]> 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
}
--
2.39.2
reply other threads:[~2023-03-10 11:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230310113718.2304961-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).