From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 85BFD3AA9825; Fri, 18 Jun 2021 14:43:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 85BFD3AA9825 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 r9-9589] libstdc++: Fix find_type helper to work consistently X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: ebf5768c9658cb6a555d58d8ad8bd1f49dabddaa X-Git-Newrev: 3f023bc5bb3d260ffe7d6e1f333fb41bbbbae444 Message-Id: <20210618144324.85BFD3AA9825@sourceware.org> Date: Fri, 18 Jun 2021 14:43:24 +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: Fri, 18 Jun 2021 14:43:24 -0000 https://gcc.gnu.org/g:3f023bc5bb3d260ffe7d6e1f333fb41bbbbae444 commit r9-9589-g3f023bc5bb3d260ffe7d6e1f333fb41bbbbae444 Author: Jonathan Wakely Date: Thu Mar 11 16:48:32 2021 +0000 libstdc++: Fix find_type helper to work consistently The find_type helper function sometimes results in "class X::name" and lookup for that fails. For more details see "Problem 1" in https://gcc.gnu.org/pipermail/libstdc++/2021-March/052132.html and the example at https://sourceware.org/bugzilla/show_bug.cgi?id=27510#c2 This patch replaces typ.unqualified() with typ.tag, which is never qualified, and will never include the 'class' or 'struct' keywords. Using the .tag attribute should be safe here because we know we are looking at a class type and we've already used strip_typedefs(). libstdc++-v3/ChangeLog: * python/libstdcxx/v6/printers.py (find_type): Use tag attribute instead of unqualified() method. (cherry picked from commit 9dacc828bf8b087ddfaf797ed7238da45609082c) Diff: --- libstdc++-v3/python/libstdcxx/v6/printers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 32b8210414a..0c94a038437 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -85,8 +85,8 @@ except ImportError: def find_type(orig, name): typ = orig.strip_typedefs() while True: - # Strip cv-qualifiers. PR 67440. - search = '%s::%s' % (typ.unqualified(), name) + # Use Type.tag to ignore cv-qualifiers. PR 67440. + search = '%s::%s' % (typ.tag, name) try: return gdb.lookup_type(search) except RuntimeError: