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 ESMTP id 9883D3857817 for ; Mon, 17 May 2021 15:43:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9883D3857817 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-GP_Yqb4AP7aNQfIPy7FEAA-1; Mon, 17 May 2021 11:43:29 -0400 X-MC-Unique: GP_Yqb4AP7aNQfIPy7FEAA-1 Received: by mail-qv1-f71.google.com with SMTP id n12-20020a0c8c0c0000b02901edb8963d4dso5020719qvb.18 for ; Mon, 17 May 2021 08:43:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yivmF3ISvMwa/V6mnZS8bEHxreoZkySuGRV3C/lmm7I=; b=AQZ/wIbGCtNPxANcVGjOf/8rIaEQCbtH0R7//87traQjiYzkps62491wmSHMymgzED 9t1ng2hQ8jU3GuLOiJ8gTj/hyFW7GWAKE/wdMFp1+Syntj7t0nyNPAyG5tX2OSahY3Nf 9j5UAOjjb9OdfADWwu1YQSnXa/NGtoCxKDYdh6dMWFL2jSe7c8sKGHMXUpZgB1C4/zbC iaWuaSfoZwFqIH1f1OBMgZMct6TWq4yduLPcSmN0a28kZDaAvM/lqhoZWcMXSjafKx1b NzN2NFa0ZFyMneneuSIVEa6YalYowMUjhtsauh9IC+xtp3RCNEK5NfwQv8nA9HG/0Z1D EppA== X-Gm-Message-State: AOAM531U+2Q1Ja3mg9aPIGIKHulfp7FrFY9brutWZXUB4nCsIaHPMdFS YylwSwmzrhwrcRvsYwjuqrxcjfSo0uaM5vEFuzeTNdprgme6TcbuYK+SJWE/YwbUcN1vRfxvUzy m3q0eAKwwoz5f7k8= X-Received: by 2002:ac8:5c02:: with SMTP id i2mr104033qti.159.1621266208838; Mon, 17 May 2021 08:43:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSCHAI999bJbAj1aGt3EzUZ450hhMek5uSlsYfdBg1GU+j2dt6gLH0qT0Pztg7oW3Z6yLWSg== X-Received: by 2002:ac8:5c02:: with SMTP id i2mr104012qti.159.1621266208605; Mon, 17 May 2021 08:43:28 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id c14sm10766476qtc.5.2021.05.17.08.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 08:43:28 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Fix up semiregular-box partial specialization [PR100475] Date: Mon, 17 May 2021 11:43:26 -0400 Message-Id: <20210517154326.840680-1-ppalka@redhat.com> X-Mailer: git-send-email 2.31.1.621.g97eea85a0a MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-16.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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 17 May 2021 15:43:33 -0000 This makes the in-place constructor of our partial specialization of __box for already-semiregular types to use direct-non-list-initialization (in accordance with the specification of the primary template), and additionally makes its data() member function use std::__addressof. Tested on x86_64-pc-linux-gnu, does this look OK for 10/11/trunk? libstdc++-v3/ChangeLog: PR libstdc++/100475 * include/std/ranges (__box::__box): Use non-list-initialization in member initializer list of in-place constructor of the partial specialization for semiregular types. (__box::operator->): Use std::__addressof. * testsuite/std/ranges/adaptors/detail/semiregular_box.cc (test02): New test. * testsuite/std/ranges/single_view.cc (test04): New test. --- libstdc++-v3/include/std/ranges | 6 +++--- .../ranges/adaptors/detail/semiregular_box.cc | 18 ++++++++++++++++++ .../testsuite/std/ranges/single_view.cc | 16 ++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 0f69d4f0839..1707aeaebcd 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -163,7 +163,7 @@ namespace ranges constexpr explicit __box(in_place_t, _Args&&... __args) noexcept(is_nothrow_constructible_v<_Tp, _Args...>) - : _M_value{std::forward<_Args>(__args)...} + : _M_value(std::forward<_Args>(__args)...) { } constexpr bool @@ -180,11 +180,11 @@ namespace ranges constexpr _Tp* operator->() noexcept - { return &_M_value; } + { return std::__addressof(_M_value); } constexpr const _Tp* operator->() const noexcept - { return &_M_value; } + { return std::__addressof(_M_value); } }; } // namespace __detail diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc index 65931dea51a..ed694e04fd1 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc @@ -81,3 +81,21 @@ test01() return true; } static_assert(test01()); + +template + struct A { + A() requires make_semiregular; + A(int, int); + A(std::initializer_list) = delete; + }; + +void +test02() +{ + // PR libstdc++/100475 + static_assert(std::semiregular>); + __box> x2(std::in_place, 0, 0); + + static_assert(!std::semiregular>); + __box> x1(std::in_place, 0, 0); +} diff --git a/libstdc++-v3/testsuite/std/ranges/single_view.cc b/libstdc++-v3/testsuite/std/ranges/single_view.cc index 97bc39bb636..f530cc07565 100644 --- a/libstdc++-v3/testsuite/std/ranges/single_view.cc +++ b/libstdc++-v3/testsuite/std/ranges/single_view.cc @@ -58,9 +58,25 @@ test03() VERIFY(*std::ranges::begin(s3) == 'a'); } +void +test04() +{ + // PR libstdc++/100475 + struct A { + A() = default; + A(int, int) { } + A(std::initializer_list) = delete; + void operator&() const = delete; + }; + std::ranges::single_view s(std::in_place, 0, 0); + s.data(); + std::as_const(s).data(); +} + int main() { test01(); test02(); test03(); + test04(); } -- 2.31.1.621.g97eea85a0a