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 862C4385736E for ; Fri, 9 Sep 2022 20:14:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 862C4385736E 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=1662754492; 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=yumc88VNy839W92MW8DWYmYzKQ0yZORWx0LFC5D6aJ8=; b=OJ6qocw4t3qMrvpr8n1FZgkXtXNMbZxubJhOd96La1hhUJ7L4NNS/XaeFKMVHdhtWW9JMQ HoEBlCPXy/T5yt0IlJryfAlXHQBVE4C+uu2ZTzvXWwGS3HRRyrKT7cUXFTM9ingDcaIDiy IKFhBn8jsj7NRvwolM1lfrLxvFlBHBI= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-633-H7b1_EF7MO64uGcihA3kpQ-1; Fri, 09 Sep 2022 16:14:45 -0400 X-MC-Unique: H7b1_EF7MO64uGcihA3kpQ-1 Received: by mail-qk1-f199.google.com with SMTP id x22-20020a05620a259600b006b552a69231so2362750qko.18 for ; Fri, 09 Sep 2022 13:14:44 -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=yumc88VNy839W92MW8DWYmYzKQ0yZORWx0LFC5D6aJ8=; b=HMEA7VS9JmC93VYvkb4pboKglPG6zm6DzuhkDVHv/26AQoji0x/6U3SwIoiaHQxYY/ QaH8VB6iO7HU0yHmkCKCQSEeDbaZugpRAkRmcMKXUDJp4gjmzHUp4gbJ6OiVS2i0xV80 Q8io0WIFf2Em+sC2Wx/CHRY/MzyQuwYKF7kgMFcPB9GIexZ+K4NXBR2j6vWwX26w5Ow4 uUVFVFGrYy7CsMlO7gnvt9DlOlIuk62rEc0+L1xyn0MVb3rfJwBKfnCpBKRUrBtssqGJ 4AqMEyBgWTIVpOJIBqBhHOyeuHRbhWfZaY6X1/3uK1lfXWA73aK7ypnjog4xGhh45ClU 7XIQ== X-Gm-Message-State: ACgBeo3CVI87ekpukX217QErBveTk05PTF4BdzS+u7mNXe4P6QEyd51O ljp0+/KFBJT/o/LvOZg9i9gdPnKTbD6dChlgUeo75zX5Ne7gV2God8Z4e8E3T8JrHHgmEOqxvNr zTuu7cokzk2AGkjexQO9PPfZP1inxF00= X-Received: by 2002:a05:622a:11c2:b0:343:69d:65b2 with SMTP id n2-20020a05622a11c200b00343069d65b2mr14456986qtk.491.1662754484648; Fri, 09 Sep 2022 13:14:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR6YrIb5duShI0AalPxnxXZmNlKZrvoEC/vgloDpMOn/DpEdyPKogkRYTwTDyMwwi195cLMA+tMBLedO8/Li/PY= X-Received: by 2002:a05:622a:11c2:b0:343:69d:65b2 with SMTP id n2-20020a05622a11c200b00343069d65b2mr14456964qtk.491.1662754484439; Fri, 09 Sep 2022 13:14:44 -0700 (PDT) MIME-Version: 1.0 References: <20210923180837.633173-1-rodgert@appliantology.com> <20210927141031.651313-1-rodgert@appliantology.com> <8657FF75-BB98-4C92-9985-B953D0CA6061@googlemail.com> In-Reply-To: From: Jonathan Wakely Date: Fri, 9 Sep 2022 21:14:33 +0100 Message-ID: Subject: Re: Patch ping (was Re: [PATCH] libstdc++: Clear padding bits in atomic compare_exchange) To: Thomas Rodgers Cc: Iain Sandoe , Rainer Orth , Jakub Jelinek , "libstdc++" , GCC Patches , Thomas Rodgers X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="0000000000006512c705e8443217" X-Spam-Status: No, score=-13.0 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_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000006512c705e8443217 Content-Type: text/plain; charset="UTF-8" On Fri, 9 Sept 2022 at 20:01, Thomas Rodgers wrote: > > s/__weak/__is_weak/g perhaps? Yes, that'll do. Fixed by the attached, with a test to avoid it happening again. Tested x86_64-linux, pushed to trunk. > > On Fri, Sep 9, 2022 at 11:46 AM Iain Sandoe via Libstdc++ wrote: >> >> >> >> > On 9 Sep 2022, at 19:36, Rainer Orth wrote: >> > >> >> >> Here's a complete patch that combines the various incremental patches >> >> that have been going around. I'm testing this now. >> >> >> >> Please take a look. >> > >> > unfortunately, this patch broke macOS bootstrap (seen on >> > x86_64-apple-darwin11.4.2): >> > >> > In file included from /var/gcc/regression/master/10.7-gcc/build/x86_64-apple-darwin11.4.2/libstdc++-v3/include/bits/shared_ptr_atomic.h:33, >> > from /var/gcc/regression/master/10.7-gcc/build/x86_64-apple-darwin11.4.2/libstdc++-v3/include/memory:78, >> > from /vol/gcc/src/hg/master/darwin/libstdc++-v3/include/precompiled/stdc++.h:82: >> > /var/gcc/regression/master/10.7-gcc/build/x86_64-apple-darwin11.4.2/libstdc++-v3/include/bits/atomic_base.h: In function 'bool std::__atomic_impl::__compare_exchange(_Tp&, _Val<_Tp>&, _Val<_Tp>&, bool, std::memory_order, std::memory_order)': >> > /var/gcc/regression/master/10.7-gcc/build/x86_64-apple-darwin11.4.2/libstdc++-v3/include/bits/atomic_base.h:1008:49: error: expected primary-expression before ',' token >> > 1008 | __weak, int(__s), int(__f))) >> > | ^ >> > /var/gcc/regression/master/10.7-gcc/build/x86_64-apple-darwin11.4.2/libstdc++-v3/include/bits/atomic_base.h:1017:50: error: expected primary-expression before ',' token >> > 1017 | __weak, int(__s), int(__f)); >> > | ^ >> > >> > Darwin gcc predefines __weak= in gcc/config/darwin-c.cc (darwin_cpp_builtins). >> >> yes, __weak and __strong are Objective C things (in principle, applicable to non-Darwin targets >> using NeXT runtime - there is at least one such target). >> >> Iain >> --0000000000006512c705e8443217 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_l7ux2pop0 Y29tbWl0IDAwNzY4MGY5NDZlYWZmYTNjNjMyMTYyNDEyOWUxZWMxOGU2NzMwOTEKQXV0aG9yOiBK b25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNvbT4KRGF0ZTogICBGcmkgU2VwIDkgMjE6 MDM6NTggMjAyMgoKICAgIGxpYnN0ZGMrKzogUmVuYW1lIHBhcmFtZXRlciB0byBhdm9pZCBkYXJ3 aW4gX193ZWFrIHF1YWxpZmllcgogICAgCiAgICBsaWJzdGRjKystdjMvQ2hhbmdlTG9nOgogICAg CiAgICAgICAgICAgICogaW5jbHVkZS9iaXRzL2F0b21pY19iYXNlLmggKF9fYXRvbWljX2ltcGw6 Ol9fY29tcGFyZV9leGNoYW5nZSk6CiAgICAgICAgICAgIFJlbmFtZSBfX3dlYWsgdG8gX19pc193 ZWFrLgogICAgICAgICAgICAqIHRlc3RzdWl0ZS8xN19pbnRyby9uYW1lcy5jYzogQWRkIF9fd2Vh ayBhbmQgX19zdHJvbmcuCgpkaWZmIC0tZ2l0IGEvbGlic3RkYysrLXYzL2luY2x1ZGUvYml0cy9h dG9taWNfYmFzZS5oIGIvbGlic3RkYysrLXYzL2luY2x1ZGUvYml0cy9hdG9taWNfYmFzZS5oCmlu ZGV4IDI5MzE1NTQ3YWFiLi42ZWEzMjY4ZmRmMCAxMDA2NDQKLS0tIGEvbGlic3RkYysrLXYzL2lu Y2x1ZGUvYml0cy9hdG9taWNfYmFzZS5oCisrKyBiL2xpYnN0ZGMrKy12My9pbmNsdWRlL2JpdHMv YXRvbWljX2Jhc2UuaApAQCAtOTkwLDcgKzk5MCw4IEBAIF9HTElCQ1hYX0JFR0lOX05BTUVTUEFD RV9WRVJTSU9OCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgX1RwPgogICAgICAgX0dMSUJDWFhfQUxX QVlTX0lOTElORSBib29sCiAgICAgICBfX2NvbXBhcmVfZXhjaGFuZ2UoX1RwJiBfX3ZhbCwgX1Zh bDxfVHA+JiBfX2UsIF9WYWw8X1RwPiYgX19pLAotCQkJIGJvb2wgX193ZWFrLCBtZW1vcnlfb3Jk ZXIgX19zLCBtZW1vcnlfb3JkZXIgX19mKSBub2V4Y2VwdAorCQkJIGJvb2wgX19pc193ZWFrLAor CQkJIG1lbW9yeV9vcmRlciBfX3MsIG1lbW9yeV9vcmRlciBfX2YpIG5vZXhjZXB0CiAgICAgICB7 CiAJX19nbGliY3h4X2Fzc2VydChfX2lzX3ZhbGlkX2NtcGV4Y2hfZmFpbHVyZV9vcmRlcihfX2Yp KTsKIApAQCAtMTAwNSw3ICsxMDA2LDcgQEAgX0dMSUJDWFhfQkVHSU5fTkFNRVNQQUNFX1ZFUlNJ T04KIAkgICAgX19hdG9taWNfaW1wbDo6X19jbGVhcl9wYWRkaW5nKCpfX2V4cCk7CiAJICAgIGlm IChfX2F0b21pY19jb21wYXJlX2V4Y2hhbmdlKHN0ZDo6X19hZGRyZXNzb2YoX192YWwpLCBfX2V4 cCwKIAkJCQkJICBfX2F0b21pY19pbXBsOjpfX2NsZWFyX3BhZGRpbmcoX19pKSwKLQkJCQkJICBf X3dlYWssIGludChfX3MpLCBpbnQoX19mKSkpCisJCQkJCSAgX19pc193ZWFrLCBpbnQoX19zKSwg aW50KF9fZikpKQogCSAgICAgIHJldHVybiB0cnVlOwogCSAgICBfX2J1aWx0aW5fbWVtY3B5KHN0 ZDo6X19hZGRyZXNzb2YoX19lKSwgX19leHAsIHNpemVvZihfVnApKTsKIAkgICAgcmV0dXJuIGZh bHNlOwpAQCAtMTAxNCw3ICsxMDE1LDcgQEAgX0dMSUJDWFhfQkVHSU5fTkFNRVNQQUNFX1ZFUlNJ T04KIAkgIHJldHVybiBfX2F0b21pY19jb21wYXJlX2V4Y2hhbmdlKHN0ZDo6X19hZGRyZXNzb2Yo X192YWwpLAogCQkJCQkgICBzdGQ6Ol9fYWRkcmVzc29mKF9fZSksCiAJCQkJCSAgIHN0ZDo6X19h ZGRyZXNzb2YoX19pKSwKLQkJCQkJICAgX193ZWFrLCBpbnQoX19zKSwgaW50KF9fZikpOworCQkJ CQkgICBfX2lzX3dlYWssIGludChfX3MpLCBpbnQoX19mKSk7CiAgICAgICB9CiAgIH0gLy8gbmFt ZXNwYWNlIF9fYXRvbWljX2ltcGwKIApkaWZmIC0tZ2l0IGEvbGlic3RkYysrLXYzL3Rlc3RzdWl0 ZS8xN19pbnRyby9uYW1lcy5jYyBiL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvMTdfaW50cm8vbmFt ZXMuY2MKaW5kZXggZWRlMmZlOGNhYTcuLjg2ZmI4Zjg5OTliIDEwMDY0NAotLS0gYS9saWJzdGRj KystdjMvdGVzdHN1aXRlLzE3X2ludHJvL25hbWVzLmNjCisrKyBiL2xpYnN0ZGMrKy12My90ZXN0 c3VpdGUvMTdfaW50cm8vbmFtZXMuY2MKQEAgLTEyOSw2ICsxMjksMTAgQEAKIC8vIFRoaXMgY2xh c2hlcyB3aXRoIG5ld2xpYiBzbyBkb24ndCB1c2UgaXQuCiAjIGRlZmluZSBfX2xvY2thYmxlCQlj YW5ub3QgYmUgdXNlZCBhcyBhbiBpZGVudGlmaWVyCiAKKyNpZm5kZWYgX19BUFBMRV9fCisjZGVm aW5lIF9fd2VhayAgIHByZWRlZmluZWQgcXVhbGlmaWVyIG9uIGRhcndpbgorI2RlZmluZSBfX3N0 cm9uZyBwcmVkZWZpbmVkIHF1YWxpZmllciBvbiBkYXJ3aW4KKyNlbmRpZgogCiAvLyBDb21tb24g dGVtcGxhdGUgcGFyYW1ldGVyIG5hbWVzCiAjZGVmaW5lIE91dHB1dEl0ZXJhdG9yCQlPdXRwdXRJ dGVyYXRvciBpcyBub3QgYSByZXNlcnZlZCBuYW1lCg== --0000000000006512c705e8443217--