diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-03-10 11:06:25 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-04-27 21:32:01 +0100 |
| commit | 3ca17b2b6be8e9bab2ee06636826d92604104475 (patch) | |
| tree | 79368e47ad31c8479da6f911f92e7dbc3baaf8a5 /libstdc++-v3 | |
| parent | 6930165acd05c8eef88a99b9546742b108e0c84e (diff) | |
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().
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/xmethods.py | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py index 991d945321a..d6cbcf139c5 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 e7cdfa4bd53..7b9e3e5534d 100644 --- a/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/shared_ptr.cc @@ -36,6 +36,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.* } } @@ -66,6 +68,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 } |