From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8228F385802B; Mon, 11 Jan 2021 17:44:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8228F385802B 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 r8-10719] libstdc++: Fix compatibility support in unique_ptr pretty printer X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-8 X-Git-Oldrev: c0886185f6047d686f63a1569b562858ee74f9c3 X-Git-Newrev: 87d89815281af7ef2e3af2a373755be3ef1ef0ec Message-Id: <20210111174444.8228F385802B@sourceware.org> Date: Mon, 11 Jan 2021 17:44:44 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2021 17:44:44 -0000 https://gcc.gnu.org/g:87d89815281af7ef2e3af2a373755be3ef1ef0ec commit r8-10719-g87d89815281af7ef2e3af2a373755be3ef1ef0ec Author: Jonathan Wakely Date: Mon Aug 10 18:44:06 2020 +0100 libstdc++: Fix compatibility support in unique_ptr pretty printer The support for the old std::unique_ptr implementation was failing, because it tried to work on a typedef instead of the underlying type. The test supposed to verify the support worked wasn't using a typedef, so didn't notice the problem. libstdc++-v3/ChangeLog: * python/libstdcxx/v6/printers.py (UniquePointerPrinter.__init__): Use gdb.Type.strip_typedefs(). * testsuite/libstdc++-prettyprinters/compat.cc: Use a typedef in the emulated old type. (cherry picked from commit ed11f7e84bcae89f486f5023e566726a7faa7dd4) Diff: --- libstdc++-v3/python/libstdcxx/v6/printers.py | 10 ++++++---- libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 36352b8d0a8..69d5835e0c2 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -179,13 +179,13 @@ class UniquePointerPrinter: def __init__ (self, typename, val): self.val = val - impl_type = val.type.fields()[0].type.tag - if is_specialization_of(impl_type, '__uniq_ptr_impl'): # New implementation + impl_type = val.type.fields()[0].type.strip_typedefs() + if is_specialization_of(str(impl_type), '__uniq_ptr_impl'): # New implementation tuple_member = val['_M_t']['_M_t'] - elif is_specialization_of(impl_type, 'tuple'): + elif is_specialization_of(str(impl_type), 'tuple'): tuple_member = val['_M_t'] else: - raise ValueError("Unsupported implementation for unique_ptr: %s" % impl_type) + raise ValueError("Unsupported implementation for unique_ptr: %s" % str(impl_type)) tuple_impl_type = tuple_member.type.fields()[0].type # _Tuple_impl tuple_head_type = tuple_impl_type.fields()[1].type # _Head_base head_field = tuple_head_type.fields()[0] @@ -193,6 +193,8 @@ class UniquePointerPrinter: self.pointer = tuple_member['_M_head_impl'] elif head_field.is_base_class: self.pointer = tuple_member.cast(head_field.type) + else: + raise ValueError("Unsupported implementation for tuple in unique_ptr: %s" % str(impl_type)) def children (self): return SmartPtrIterator(self.pointer) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc index 1555ba8e798..81e0ce7213f 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc @@ -54,7 +54,9 @@ namespace std { unique_ptr(T* p) { _M_t._M_head_impl = p; } - tuple _M_t; + using __tuple_type = tuple; + + __tuple_type _M_t; }; // Old representation of std::optional, before GCC 9