From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 016413858D38 for ; Sat, 1 Oct 2022 10:07:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 016413858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664618824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wQ8/A0k9OvxhXpf33GHUKOAe3KLCt3EV48vUiTc5QSA=; b=BSUpSqvP9t65CJU551pNPhDDppzDEHhpe99v4ePkR513mjj9DdzlgDF3L+n/xehGJZbNXA jh7k45/X7pCHAwQSkSkqJzD/kpvK/FpESrFpABFrlNThkoP1/DDsO7fydKbmDDLLI5sSjC ii0dA9OVbbWUTE8ufkx4IInQH4o27GQ= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-38-lV1jC9TlPMuT6axtjrMLvg-1; Sat, 01 Oct 2022 06:07:02 -0400 X-MC-Unique: lV1jC9TlPMuT6axtjrMLvg-1 Received: by mail-qv1-f70.google.com with SMTP id mf6-20020a0562145d8600b004b1842f631aso31308qvb.1 for ; Sat, 01 Oct 2022 03:07:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=wQ8/A0k9OvxhXpf33GHUKOAe3KLCt3EV48vUiTc5QSA=; b=OHjMnO8RNXTqiHikLkvHp0rsq4pM2Zbb+AxxPYPh6cXT3yUl8yiT561NzDQZOvl7Xz O3ltuw9RFp2hNn0XMMMZSB3YjEP1p3REopYqbMEpIh8ZktJ4QzN+QoP9DhNi0HMt9gXw LuWWKI1Az9CBNSl+ocDypGu9LeVInR4kK1OPYLnkRnF5++sL9ihaK71hawJaCpm7hHdo 9eil1gCvoMQh07IUCNBv/2wjOCsiYmt5VnqtJKa7JVkdujhxYIoyBuQ28mi9T/zuP0JO GzZ6iup4hTV5f4pID0P7VQ9e0oARM3mWLdP86N5jEd6rB5SZvqHAhiutp82JtPe+MaWT Xhyw== X-Gm-Message-State: ACrzQf03JTt2ETcdnNv9K2GIcB46lk9BUwoyi28feGA/s70hQX2KYb2O 4WdHHx2r2mtozsE9EHDgiMXD6aOV9qmsy5Z3y7qaImnVtSWb5MP+5VflL2F3i0/ccYWTvdkZsaO vAeKrPXyWkEBy2bS2hK9HIyRZhv9B8tC1Gg== X-Received: by 2002:a05:622a:408a:b0:35b:b5fa:5e32 with SMTP id cg10-20020a05622a408a00b0035bb5fa5e32mr9851279qtb.122.1664618822143; Sat, 01 Oct 2022 03:07:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yt1hdpp7pcMhh9WKMnLVBt+9LLVs88rKjZENdw8Iww1kAAJMaNYFbhrYwcWNeqgmef0s12izWoCz5+6F1Ekc= X-Received: by 2002:a05:622a:408a:b0:35b:b5fa:5e32 with SMTP id cg10-20020a05622a408a00b0035bb5fa5e32mr9851268qtb.122.1664618821896; Sat, 01 Oct 2022 03:07:01 -0700 (PDT) MIME-Version: 1.0 References: <1d7b853e-0180-718c-1947-2517272f44e8@gmail.com> In-Reply-To: <1d7b853e-0180-718c-1947-2517272f44e8@gmail.com> From: Jonathan Wakely Date: Sat, 1 Oct 2022 11:06:51 +0100 Message-ID: Subject: Re: [PATCH] Fix gdb printers for std::string To: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= Cc: "libstdc++@gcc.gnu.org" , gcc-patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="00000000000091319a05e9f645e5" X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000091319a05e9f645e5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 1 Oct 2022 at 08:20, Fran=C3=A7ois Dumont via Libstdc++ wrote: > > I had forgotten to re-run tests after I removed the #define > _GLIBCXX_USE_CXX11_ABI 0. > > The comment was misleading, it could also impact output of std::list. > > I am also restoring the correct std::string alias for > std::__cxx11::basic_string, even if with my workaround it doesn't really > matter as the one for std::basic_string will be used. > > I also restored the printer for std::__cxx11::string typedef. Is it > intentional to keep this ? Yes, I kept that intentionally. There can be programs where some objects still use that typedef, if those objects were compiled with GCC 8.x or older. > > libstdc++: Fix gdb pretty printers when dealing with std::string > > Since revision 33b43b0d8cd2de722d177ef823930500948a7487 std::string > and other > similar typedef are ambiguous from a gdb point of view because it > matches both > std::basic_string and std::__cxx11::basic_string > symbols. For those > typedef add a workaround to accept the substitution as long as the > same regardless > of __cxx11 namespace. Thanks for figuring out what was going wrong here, and how to fix it. > > Also avoid to register printers for types in std::__cxx11::__8:: > namespace, there is > no such symbols. > > libstdc++-v3/ChangeLog: > > * libstdc++-v3/python/libstdcxx/v6/printers.py > (Printer.add_version): Do not add > version namespace for __cxx11 symbols. > (add_one_template_type_printer): Likewise. > (add_one_type_printer): Likewise. > (FilteringTypePrinter._recognizer.recognize): Add a > workaround for std::string & al > ambiguous typedef matching both std:: and std::__cxx11:: > symbols. > (register_type_printers): Refine type registration to limit > false positive in > FilteringTypePrinter._recognize.recognize requiring to look > for the type in gdb. I don't really like this part of the change though: @@ -2105,29 +2120,29 @@ def register_type_printers(obj): return # Add type printers for typedefs std::string, std::wstring etc. - for ch in ('', 'w', 'u8', 'u16', 'u32'): - add_one_type_printer(obj, 'basic_string', ch + 'string') - add_one_type_printer(obj, '__cxx11::basic_string', ch + 'string') + for ch in (('char', ''), ('wchar_t', 'w'), ('char8_t', 'u8'), ('char16_t', 'u16'), ('char32_t', 'u32')): + add_one_type_printer(obj, 'basic_string<' + ch[0], ch[1] + 'string= ') + add_one_type_printer(obj, '__cxx11::basic_string<' + ch[0], ch[1] + 'string') As the docs for FilteringTypePrinter says, the first argument is supposed to be the class template name: class FilteringTypePrinter(object): r""" A type printer that uses typedef names for common template specializati= ons. Args: match (str): The class template to recognize. name (str): The typedef-name that will be used instead. Checks if a specialization of the class template 'match' is the same ty= pe as the typedef 'name', and prints it as 'name' instead. e.g. if an instantiation of std::basic_istream is the same type a= s std::istream then print it as std::istream. """ With this change, the "class template" is sometimes just a string prefix of a particular specialization, e.g. "basic_string X-Attachment-Id: f_l8pr22w40 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My9weXRob24vbGlic3RkY3h4L3Y2L3ByaW50ZXJzLnB5 IGIvbGlic3RkYysrLXYzL3B5dGhvbi9saWJzdGRjeHgvdjYvcHJpbnRlcnMucHkKaW5kZXggMjQ1 YjZlM2RiY2QuLjZhMGI4YTIyZjFkIDEwMDY0NAotLS0gYS9saWJzdGRjKystdjMvcHl0aG9uL2xp YnN0ZGN4eC92Ni9wcmludGVycy5weQorKysgYi9saWJzdGRjKystdjMvcHl0aG9uL2xpYnN0ZGN4 eC92Ni9wcmludGVycy5weQpAQCAtMjA0NSwyNSArMjA0NSwzNSBAQCBjbGFzcyBGaWx0ZXJpbmdU eXBlUHJpbnRlcihvYmplY3QpOgogICAgIEFyZ3M6CiAgICAgICAgIG1hdGNoIChzdHIpOiBUaGUg Y2xhc3MgdGVtcGxhdGUgdG8gcmVjb2duaXplLgogICAgICAgICBuYW1lIChzdHIpOiBUaGUgdHlw ZWRlZi1uYW1lIHRoYXQgd2lsbCBiZSB1c2VkIGluc3RlYWQuCisgICAgICAgIHRhcmcxIChzdHIs IG9wdGlvbmFsKTogVGhlIGZpcnN0IHRlbXBsYXRlIGFyZ3VtZW50LiBEZWZhdWx0cyB0byBOb25l LgorICAgICAgICAgICAgSWYgYXJnMSBpcyBwcm92aWRlZCwgb25seSBtYXRjaCBzcGVjaWFsaXph dGlvbnMgd2l0aCB0aGlzIHR5cGUKKyAgICAgICAgICAgIGFzIHRoZSBmaXJzdCB0ZW1wbGF0ZSBh cmd1bWVudCwgZS5nLiBpZiBtYXRjaD0nYmFzaWNfc3RyaW5nJwogCiAgICAgQ2hlY2tzIGlmIGEg c3BlY2lhbGl6YXRpb24gb2YgdGhlIGNsYXNzIHRlbXBsYXRlICdtYXRjaCcgaXMgdGhlIHNhbWUg dHlwZQogICAgIGFzIHRoZSB0eXBlZGVmICduYW1lJywgYW5kIHByaW50cyBpdCBhcyAnbmFtZScg aW5zdGVhZC4KIAotICAgIGUuZy4gaWYgYW4gaW5zdGFudGlhdGlvbiBvZiBzdGQ6OmJhc2ljX2lz dHJlYW08QywgVD4gaXMgdGhlIHNhbWUgdHlwZSBhcworICAgIGUuZy4gZm9yIG1hdGNoPSdiYXNp Y19pc3RyZWFtJywgbmFtZT0naXN0cmVhbScsIGlmIGFueSBzcGVjaWFsaXphdGlvbiBvZgorICAg IHN0ZDo6YmFzaWNfaXN0cmVhbTxDLCBUPiBpcyB0aGUgc2FtZSB0eXBlIGFzIHN0ZDo6aXN0cmVh bSB0aGVuIHByaW50IGl0IGFzCisgICAgc3RkOjppc3RyZWFtLgorCisgICAgZS5nLiBmb3IgbWF0 Y2g9J2Jhc2ljX2lzdHJlYW0nLCBuYW1lPSdpc3RyZWFtJywgdGFyZzE9J2NoYXInLCBpZiBhbnkK KyAgICBzcGVjaWFsaXphdGlvbiBvZiBzdGQ6OmJhc2ljX2lzdHJlYW08Y2hhciwgVD4gaXMgdGhl IHNhbWUgdHlwZSBhcwogICAgIHN0ZDo6aXN0cmVhbSB0aGVuIHByaW50IGl0IGFzIHN0ZDo6aXN0 cmVhbS4KICAgICAiIiIKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBtYXRjaCwgbmFtZSk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIG1hdGNoLCBuYW1lLCB0YXJnMSA9IE5vbmUpOgogICAgICAg ICBzZWxmLm1hdGNoID0gbWF0Y2gKICAgICAgICAgc2VsZi5uYW1lID0gbmFtZQorICAgICAgICBz ZWxmLnRhcmcxID0gdGFyZzEKICAgICAgICAgc2VsZi5lbmFibGVkID0gVHJ1ZQogCiAgICAgY2xh c3MgX3JlY29nbml6ZXIob2JqZWN0KToKICAgICAgICAgIlRoZSByZWNvZ25pemVyIGNsYXNzIGZv ciBGaWx0ZXJpbmdUeXBlUHJpbnRlci4iCiAKLSAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG1h dGNoLCBuYW1lKToKKyAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG1hdGNoLCBuYW1lLCB0YXJn MSk6CiAgICAgICAgICAgICBzZWxmLm1hdGNoID0gbWF0Y2gKICAgICAgICAgICAgIHNlbGYubmFt ZSA9IG5hbWUKKyAgICAgICAgICAgIHNlbGYudGFyZzEgPSB0YXJnMQogICAgICAgICAgICAgc2Vs Zi50eXBlX29iaiA9IE5vbmUKIAogICAgICAgICBkZWYgcmVjb2duaXplKHNlbGYsIHR5cGVfb2Jq KToKQEAgLTIwNzUsNyArMjA4NSwxMSBAQCBjbGFzcyBGaWx0ZXJpbmdUeXBlUHJpbnRlcihvYmpl Y3QpOgogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICAgICAgICAgIGlmIHNlbGYu dHlwZV9vYmogaXMgTm9uZToKLSAgICAgICAgICAgICAgICBpZiBub3QgdHlwZV9vYmoudGFnLnN0 YXJ0c3dpdGgoc2VsZi5tYXRjaCk6CisgICAgICAgICAgICAgICAgaWYgc2VsZi50YWcxIGlzIG5v dCBOb25lOgorICAgICAgICAgICAgICAgICAgICBpZiBub3QgdHlwZV9vYmoudGFnLnN0YXJ0c3dp dGgoJ3t9PHt9Jy5mb3JtYXQoc2VsZi5tYXRjaCwgc2VsZi50YXJnMSk6CisgICAgICAgICAgICAg ICAgICAgICAgICAjIEZpbHRlciBkaWRuJ3QgbWF0Y2guCisgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICAgICAgICAgIGVsaWYgbm90IHR5cGVfb2JqLnRhZy5zdGFy dHN3aXRoKHNlbGYubWF0Y2gpOgogICAgICAgICAgICAgICAgICAgICAjIEZpbHRlciBkaWRuJ3Qg bWF0Y2guCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgICAgICAgICAg dHJ5OgpAQCAtMjA4NCwxOCArMjA5OCwyMyBAQCBjbGFzcyBGaWx0ZXJpbmdUeXBlUHJpbnRlcihv YmplY3QpOgogICAgICAgICAgICAgICAgICAgICBwYXNzCiAgICAgICAgICAgICBpZiBzZWxmLnR5 cGVfb2JqID09IHR5cGVfb2JqOgogICAgICAgICAgICAgICAgIHJldHVybiBzdHJpcF9pbmxpbmVf bmFtZXNwYWNlcyhzZWxmLm5hbWUpCisKKyAgICAgICAgICAgIGlmIHNlbGYubWF0Y2guc3BsaXQo Jzo6JylbLTFdIGlzICdiYXNpY19zdHJpbmcnOgorICAgICAgICAgICAgICAgIGlmIHNlbGYudHlw ZV9vYmoudGFnLnJlcGxhY2UoJ19fY3h4MTE6OicsICcnKSA9PSB0eXBlX29iai50YWcucmVwbGFj ZSgnX19jeHgxMTo6JywgJycpOgorKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHN0cmlwX2lu bGluZV9uYW1lc3BhY2VzKHNlbGYubmFtZSkKKwogICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAog ICAgIGRlZiBpbnN0YW50aWF0ZShzZWxmKToKICAgICAgICAgIlJldHVybiBhIHJlY29nbml6ZXIg b2JqZWN0IGZvciB0aGlzIHR5cGUgcHJpbnRlci4iCiAgICAgICAgIHJldHVybiBzZWxmLl9yZWNv Z25pemVyKHNlbGYubWF0Y2gsIHNlbGYubmFtZSkKIAotZGVmIGFkZF9vbmVfdHlwZV9wcmludGVy KG9iaiwgbWF0Y2gsIG5hbWUpOgotICAgIHByaW50ZXIgPSBGaWx0ZXJpbmdUeXBlUHJpbnRlcign c3RkOjonICsgbWF0Y2gsICdzdGQ6OicgKyBuYW1lKQorZGVmIGFkZF9vbmVfdHlwZV9wcmludGVy KG9iaiwgbWF0Y2gsIG5hbWUsIHRhcmcxID0gTm9uZSk6CisgICAgcHJpbnRlciA9IEZpbHRlcmlu Z1R5cGVQcmludGVyKCdzdGQ6OicgKyBtYXRjaCwgJ3N0ZDo6JyArIG5hbWUsIHRhcmcxKQogICAg IGdkYi50eXBlcy5yZWdpc3Rlcl90eXBlX3ByaW50ZXIob2JqLCBwcmludGVyKQogICAgIGlmIF92 ZXJzaW9uZWRfbmFtZXNwYWNlOgogICAgICAgICBucyA9ICdzdGQ6OicgKyBfdmVyc2lvbmVkX25h bWVzcGFjZQotICAgICAgICBwcmludGVyID0gRmlsdGVyaW5nVHlwZVByaW50ZXIobnMgKyBtYXRj aCwgbnMgKyBuYW1lKQorICAgICAgICBwcmludGVyID0gRmlsdGVyaW5nVHlwZVByaW50ZXIobnMg KyBtYXRjaCwgbnMgKyBuYW1lLCB0YXJnMSkKICAgICAgICAgZ2RiLnR5cGVzLnJlZ2lzdGVyX3R5 cGVfcHJpbnRlcihvYmosIHByaW50ZXIpCiAKIGRlZiByZWdpc3Rlcl90eXBlX3ByaW50ZXJzKG9i aik6Cg== --00000000000091319a05e9f645e5--