From patchwork Tue Sep 16 15:18:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 120363 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C3883858C2A for ; Tue, 16 Sep 2025 15:22:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C3883858C2A Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KcmEZumX X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 7779A3858C2A for ; Tue, 16 Sep 2025 15:19:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7779A3858C2A Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7779A3858C2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1758035947; cv=none; b=U5B1seGxsbYUQ6Ho6hGLPqPcooZEIjvlc/7isqnKhdvvCnA24kipGyy+DogTaLBY/OLPndItsrQfJPahTSyIC1n4dcMZl/FZRZaeyvA/XZPPdWu1GTsm08NkM2Tz6lcYvIFf9XsndddiVzgYFtpc7T4dA5LwiD8ipDd1QDdFGlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1758035947; c=relaxed/simple; bh=otfVXMlL/WhOqC6geKxpPRjBCQwfOQ9c0WBZxAIdHfk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RNVqcPca15jCJSam2DgZwx8piiUqfr7oAVNaTdx/5ChQ9V8wrmrYfre5T+ZGuPWGdC0JmzRUXf2jA2mo80m6sOegvv3qdEb5tOMU29b+co6hoRsSMATXrW6W6vhJwLmxJ1A8i3nEDkf7RPaCMZCJK5p+vumlry48SbHHgAB7SvE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7779A3858C2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758035947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0PwVUap6M9fNMquLwzngnxKfu5uG/rmIc5ZRH9wonTk=; b=KcmEZumXfMlZEhrJjzB5C092jQpa1ApTQDtP25liZp+Kji5FcRk838KB/0UY/k8XLBA1pQ //XI750AVuaujRs7cr6mkAVcaVImgJrbiWluCvbjPniWrYOVRcIb1OUTLeND2B+8zpg7yq qaqsXPk5hkA1A3TBBEhff7gkSRvbZQw= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-332-LcICRB5_NhqSpNCOljP-1w-1; Tue, 16 Sep 2025 11:19:04 -0400 X-MC-Unique: LcICRB5_NhqSpNCOljP-1w-1 X-Mimecast-MFC-AGG-ID: LcICRB5_NhqSpNCOljP-1w_1758035943 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0A68E19560B7; Tue, 16 Sep 2025 15:19:03 +0000 (UTC) Received: from zen.kayari.org (unknown [10.42.28.4]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0F11E1800447; Tue, 16 Sep 2025 15:19:01 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: Fix missing change to views::pairwise from P2165R4 [PR121956] Date: Tue, 16 Sep 2025 16:18:49 +0100 Message-ID: <20250916151900.2680715-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: I99FD8zT-UY2LqNOyN4qNgINcCRdUW3ISPc9W5e_oYo_1758035943 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org ranges::adjacent_view::_Iterator::value_type should have been changed by r14-8710-g65b4cba9d6a9ff to always produce std::tuple, even for the N == 2 views::pairwise specialization. libstdc++-v3/ChangeLog: PR libstdc++/121956 * include/std/ranges (adjacent_view::_Iterator::value_type): Always define as std::tuple, not std::pair. * testsuite/std/ranges/adaptors/adjacent/1.cc: Check value type of views::pairwise. --- Tested powerpc64le-linux. libstdc++-v3/include/std/ranges | 4 +--- .../testsuite/std/ranges/adaptors/adjacent/1.cc | 13 +++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 6c64f4c36213..fd290ea362cc 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -5460,9 +5460,7 @@ namespace views::__adaptor public: using iterator_category = input_iterator_tag; using iterator_concept = decltype(_S_iter_concept()); - using value_type = conditional_t<_Nm == 2, - pair, range_value_t<_Base>>, - __detail::__repeated_tuple, _Nm>>; + using value_type = __detail::__repeated_tuple, _Nm>; using difference_type = range_difference_t<_Base>; _Iterator() = default; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc index 085cd4a8c54c..0a5c67f56140 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc @@ -114,6 +114,18 @@ test04() return true; } +constexpr bool +test05() +{ + // PR libstdc++/121956 + int a[2]{}; + __gnu_test::test_random_access_range r(a); + auto v = r | views::pairwise; + static_assert( std::is_same_v, + std::tuple> ); + return true; +} + int main() { @@ -121,4 +133,5 @@ main() static_assert(test02()); static_assert(test03()); static_assert(test04()); + static_assert(test05()); }