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.129.124]) by sourceware.org (Postfix) with ESMTPS id CB2EB38344D6 for ; Thu, 26 May 2022 09:21:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB2EB38344D6 Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-209-lFiqig_WNHWF3PQnUUkQwg-1; Thu, 26 May 2022 05:21:47 -0400 X-MC-Unique: lFiqig_WNHWF3PQnUUkQwg-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-2fed274f3fbso8370847b3.17 for ; Thu, 26 May 2022 02:21:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FUNGyMXtgAK2dvHuheO7ezPbYfjXsOZS5ZB8e9Cg/XQ=; b=qvc1cM0LlWgWfhNOKma7T9F3/Voq7tw7J2+V4zGH9sWxardFFjyPKA0vSYQ+/uVydj kv6vbRzU44jQY6yygOTeNuOKIUS2FXCHcpy0ejxHzsZ585Gvso8gPkVNeHOAxcqOTB2m srpQc+qDHthvgoOP7Ge7BxCXX31vpdMMgEYliBP0rOvFhLKbAFZPDroGKgfzGrmGjWd+ V4iT9rzhG1lmkjR0nW6A57aot2WhWUGwR5WFWVrPeBVsmFwhyJDnhnSj+5nHeOF2Tbs1 Rp0H5QIp5dYlSR9akOOl2FU3HcPGnKh2ven5zSy5e7coIv1nAGca1Ib/kDeyMecUUEqG hJjw== X-Gm-Message-State: AOAM531gkramLkATIBTyaB82zU69m0KMPAHgGArEwHnoLBUDSC7AlJHn fjqNugY3xDbw2Gmw9MKkqHi2+RJghkfnR9WnNPrNzvrJtnq4Hi7VwdH6sHDf3J0IDplRDEaJF03 rPwKi8fFf7HfXeqEbSQqp99GhFgM8a8U= X-Received: by 2002:a05:6902:1106:b0:64f:4e18:2c23 with SMTP id o6-20020a056902110600b0064f4e182c23mr34466404ybu.168.1653556906484; Thu, 26 May 2022 02:21:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz60Epuv83SvJsoJOclbykL9qeudtxgO8ff5/BoGFdphU6LhLzqfzcqfLNyCemroVXiiUDnnyPTBOvzjmntcxs= X-Received: by 2002:a05:6902:1106:b0:64f:4e18:2c23 with SMTP id o6-20020a056902110600b0064f4e182c23mr34466388ybu.168.1653556906245; Thu, 26 May 2022 02:21:46 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Thu, 26 May 2022 10:21:34 +0100 Message-ID: Subject: Re: [PATCH][_GLIBCXX_INLINE_VERSION] Fix std::span pretty printer 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="000000000000037e4105dfe6b89b" X-Spam-Status: No, score=-13.2 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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_FILL_THIS_FORM_SHORT, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2022 09:21:50 -0000 --000000000000037e4105dfe6b89b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 26 May 2022 at 00:38, Jonathan Wakely wrote: > > On Thu, 26 May 2022 at 00:34, Jonathan Wakely wrote: > > > > On Wed, 25 May 2022 at 21:29, Fran=C3=A7ois Dumont via Libstdc++ > > wrote: > > > > > > Hi > > > > > > Here is a patch to fix std::span pretty printer in versioned > > > namespace mode. > > > > > > Note that there is still a problem with std::atomic after this p= atch. > > > > > > got: $13 =3D std::atomic> (empty) =3D {get(= ) =3D 0x0} > > > FAIL: libstdc++-prettyprinters/cxx20.cc print spe > > Does this fix it? > > --- a/libstdc++-v3/python/libstdcxx/v6/printers.py > +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py > @@ -1734,6 +1734,7 @@ class StdAtomicPrinter: > impl =3D val['_M_impl'] > self.shptr_printer =3D SharedPointerPrinter(typename, imp= l) > self.children =3D self._shptr_children > + self.typename =3D self.typename.replace(self.value_type.= tag, typ) > > def _shptr_children(self): > return SmartPtrIterator(self.shptr_printer.pointer) > > > I'll test it with a versioned-namespace build tomorrow. No, that didn't work, but the attached patch does. Pushed to trunk. --000000000000037e4105dfe6b89b Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l3mt2m9q0 Y29tbWl0IDYzNGIwMDg5ZjY2NGNjYTk2ZDcxMjYyYjI5NTAyNWUwNTcwNTRmMmMKQXV0aG9yOiBK b25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNvbT4KRGF0ZTogICBUaHUgTWF5IDI2IDA5 OjQ5OjQwIDIwMjIKCiAgICBsaWJzdGRjKys6IEZpeCBwcmludGluZyBvZiBzdGQ6OmF0b21pYzxz aGFyZWRfcHRyPFQ+PiBmb3IgdmVyc2lvbmVkIG5hbWVzcGFjZQogICAgCiAgICBsaWJzdGRjKyst djMvQ2hhbmdlTG9nOgogICAgCiAgICAgICAgICAgICogcHl0aG9uL2xpYnN0ZGN4eC92Ni9wcmlu dGVycy5weSAoU2hhcmVkUG9pbnRlclByaW50ZXIpOiBTdHJpcAogICAgICAgICAgICB2ZXJzaW9u ZWQgbmFtZXNwYWNlIGZyb20gdGhlIHRlbXBsYXRlIGFyZ3VtZW50IHRvby4KCmRpZmYgLS1naXQg YS9saWJzdGRjKystdjMvcHl0aG9uL2xpYnN0ZGN4eC92Ni9wcmludGVycy5weSBiL2xpYnN0ZGMr Ky12My9weXRob24vbGlic3RkY3h4L3Y2L3ByaW50ZXJzLnB5CmluZGV4IDBiZDc5M2MwODk3Li4x N2Q1ZTViNTczMSAxMDA2NDQKLS0tIGEvbGlic3RkYysrLXYzL3B5dGhvbi9saWJzdGRjeHgvdjYv cHJpbnRlcnMucHkKKysrIGIvbGlic3RkYysrLXYzL3B5dGhvbi9saWJzdGRjeHgvdjYvcHJpbnRl cnMucHkKQEAgLTI0Miw2ICsyNDIsNyBAQCBjbGFzcyBTaGFyZWRQb2ludGVyUHJpbnRlcjoKICAg ICAgICAgc3RhdGUgPSAnZW1wdHknCiAgICAgICAgIHJlZmNvdW50cyA9IHNlbGYuX2dldF9yZWZj b3VudHMoKQogICAgICAgICB0YXJnID0gc2VsZi52YWwudHlwZS50ZW1wbGF0ZV9hcmd1bWVudCgw KQorICAgICAgICB0YXJnID0gc3RyaXBfdmVyc2lvbmVkX25hbWVzcGFjZShzdHIodGFyZykpCiAK ICAgICAgICAgaWYgcmVmY291bnRzICE9IDA6CiAgICAgICAgICAgICB1c2Vjb3VudCA9IHJlZmNv dW50c1snX01fdXNlX2NvdW50J10KQEAgLTI1MCw3ICsyNTEsNyBAQCBjbGFzcyBTaGFyZWRQb2lu dGVyUHJpbnRlcjoKICAgICAgICAgICAgICAgICBzdGF0ZSA9ICdleHBpcmVkLCB3ZWFrIGNvdW50 ICVkJyAlIHdlYWtjb3VudAogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBzdGF0 ZSA9ICd1c2UgY291bnQgJWQsIHdlYWsgY291bnQgJWQnICUgKHVzZWNvdW50LCB3ZWFrY291bnQg LSAxKQotICAgICAgICByZXR1cm4gJyVzPCVzPiAoJXMpJyAlIChzZWxmLnR5cGVuYW1lLCBzdHIo dGFyZyksIHN0YXRlKQorICAgICAgICByZXR1cm4gJyVzPCVzPiAoJXMpJyAlIChzZWxmLnR5cGVu YW1lLCB0YXJnLCBzdGF0ZSkKIAogZGVmIF90dXBsZV9pbXBsX2dldCh2YWwpOgogICAgICJSZXR1 cm4gdGhlIHR1cGxlIGVsZW1lbnQgc3RvcmVkIGluIGEgX1R1cGxlX2ltcGw8TiwgVD4gYmFzZSBj bGFzcy4iCg== --000000000000037e4105dfe6b89b--