From patchwork Mon Dec 18 23:06:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 180683 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1616779dyi; Mon, 18 Dec 2023 16:10:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrYeUNYTFsTb97B4kvwxQxgfsiW1vfHqHg6gy4P+4Qnv7QAdInFhZV0y7+CO6zUHUAmWuI X-Received: by 2002:a05:6870:1609:b0:203:5289:a872 with SMTP id b9-20020a056870160900b002035289a872mr9435381oae.98.1702944645692; Mon, 18 Dec 2023 16:10:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702944645; cv=pass; d=google.com; s=arc-20160816; b=toDEO9RA4oNvs50WEKo9K7sf42bt9v7+x3Ae+stOQUzTbi/2S8WoUxn570xUaZIrK8 6XBW/YZ3AAvNOMgjyis/+IzpCC8U/MQ5nEceDL0JUcfUy8ayeZl+lLAJjEQLc+UMRdpk ljcC6b/oi9h3TJgX83MkG2bmE3IF7op6KkA8kyWB1vaxK7dawPOIa5jLHq6clxDoDd++ ygSC51Qy13RJN/5iqQtuPFBPEGJagHGA+O63WVn4jC0hDF2m/a//giPUZUwBMzPwISZd iUGOgjfURu0GU3YUq4nCJM1Lv80E1ZzEE0j1OiupVqgdC/Y7fgDOj6t7MXIjA184uMq1 se8A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=AmaBTYnHwf0Xy4os8iqM9fwCHk9aMgTkvFTtTsYcj9E=; fh=EVSvWd94bH3+6DLHxQIQnUkCnGLOu/mRCJOpcO366zA=; b=tImFvaskFrm1cyaM9QG4SShIDouhfGYRUoDIMBfRNsPauw1K9Ldb8gBs0q4KkV7Cef LyX23r9sApqzYURt+Poxgi1wfEFIOnph6V4RTy0cZlTcIFRPfhpMcjM6/0BlWxo1c46Z dCLSZkEzRJb9yWaF+JwtKyUddupjGrjV1gtBjVD/4r6ySjDmGV5dhTwbrLCCtcGkbRMl NDPMUg3ykCnqNpgPWTG/W1KhpELPd3w9Yktt90acJAuBk919Jx2PMAgS5WtOyKr+ePAa LpOZjD3Bh9QDagPvBclWFRSi6MdMbpuED/mIwQTHeoJsku6rsaQvJppiswx+EtRlahLt F3fg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UJ0Vns42; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d18-20020ac86692000000b0042544d46bc0si23840880qtp.496.2023.12.18.16.10.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 16:10:45 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UJ0Vns42; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9A4BA385C6DF for ; Mon, 18 Dec 2023 23:07:06 +0000 (GMT) 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 ESMTPS id 117E03857C62 for ; Mon, 18 Dec 2023 23:06:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 117E03857C62 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 117E03857C62 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=1702940801; cv=none; b=xk+yNKbf/wL5faiS4LxoZNRJQNUMy8TeS6P6Umq6xJu6IgD1Lo12xcLevh232FXLlsPg+HOhLQ2wyjceEA3xc3kWAGEKmUz6c6CPOyMdIfF7s1EbfbbXtrrCzMBkVKuIy9SLgVUoqJ/MT4ZXdwxEmWo7Ne7Mm+3R+othzaHepgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702940801; c=relaxed/simple; bh=UWImH5vwfUTkwnGEy0gnRio8s3YM5SRYdILuOtlu7j4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=b7Et2/wOGNinmcW5YwSJyOGZEozWpiUX4BX4J6t4q80YW2qGGUIAQrgDTUNp0bZlEVRs3uFHpI+BJhZpOlqYofA5XyjQlTLdrsESdS++rwYGMbOB7ZU7IaURKgWrthJbLE20EgxyqksB12P5H82+4/kSnlqbl0tUpyE2un7tj1w= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702940799; 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: content-transfer-encoding:content-transfer-encoding; bh=AmaBTYnHwf0Xy4os8iqM9fwCHk9aMgTkvFTtTsYcj9E=; b=UJ0Vns42sR8k5Pv/H5FaO4rg9iTYoW9muldBe28znEM78TUp6u0FJmZjQC3rGscvhiJivy Lr5hVGEWFN2bnrB2vbAfyCI7WVhMec72L3Cxqy8TLOZi1S/eq4jUaMFBrjXdSZlyIu4LUl 2p2bxw7lE7aax2A+Yc1KvwNF866TEyo= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-05XJFOIrOOKzwbvz-CZEnA-1; Mon, 18 Dec 2023 18:06:38 -0500 X-MC-Unique: 05XJFOIrOOKzwbvz-CZEnA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77f504ae900so591873585a.2 for ; Mon, 18 Dec 2023 15:06:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702940796; x=1703545596; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AmaBTYnHwf0Xy4os8iqM9fwCHk9aMgTkvFTtTsYcj9E=; b=NgQKrIJqWQ8kc2hg61pES/ro305f+jq6hEcyXJML+3Xve80UUoU4vaWOHd8yLnhLg0 sfCTHf+fNZyQBqA8ztOBRXh8aFqU7S7gJHOG6K9glJTwntCxCay7nWVjqS6t3qyj701u ReRnSk+M0uXG7eKTn42Q5Gd4HhRnSh6eqYxVwwAKgOJpqWVHi9BsQ6dmsOTSTjWs+8pt Fx8yLsOyhW2UFCcBp/nJgUxIZMgRaBIfOjrDz8+yEFbrDrGdpwzIO0abA5GIIvW78rMX 8Jfzf0fWy4UXM7854Q0oEMP4jCEXN1FvRF0gdXeqwO50Lw95/A7okodkLXnvSdpheU2r 85aQ== X-Gm-Message-State: AOJu0Yy2pozZ9O0uWP58LYRWYNDHYnPI6kZbzWy5Jrib/5qKOmYVZUqB eMORlhv+oiNuu3d/tFKQyTAEGsZS9R3OFw6cnannIIMG6PCV6uYpi+PGRH4mP7FyrL2uz5Z5mfv MQjjSdZXSvHWZzeEa12J1KS9t/UopEOrFrqOF2sktccEFpgYnX+2X4pEOFWGMauFGbqoSbklTjH M= X-Received: by 2002:a05:620a:7f6:b0:780:db24:3c83 with SMTP id k22-20020a05620a07f600b00780db243c83mr4271784qkk.37.1702940796530; Mon, 18 Dec 2023 15:06:36 -0800 (PST) X-Received: by 2002:a05:620a:7f6:b0:780:db24:3c83 with SMTP id k22-20020a05620a07f600b00780db243c83mr4271774qkk.37.1702940796212; Mon, 18 Dec 2023 15:06:36 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id t16-20020a05620a035000b0076cc4610d0asm8638118qkm.85.2023.12.18.15.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 15:06:35 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [pushed] libstdc++: Make ranges::to closure objects SFINAE-friendly [PR112802] Date: Mon, 18 Dec 2023 18:06:31 -0500 Message-ID: <20231218230631.1779040-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ec MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.7 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_H3, RCVD_IN_MSPIKE_WL, 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 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785666884418203424 X-GMAIL-MSGID: 1785666884418203424 This also happens to fix composition of these closure objects. PR libstdc++/112802 PR libstdc++/113068 libstdc++-v3/ChangeLog: * include/std/ranges (__detail::_To::operator()): Add constraints. (__detail::_To2::operator()): Likewise. * testsuite/std/ranges/conv/1.cc (test_sfinae): New test. (test_composition): New test. --- libstdc++-v3/include/std/ranges | 4 ++++ libstdc++-v3/testsuite/std/ranges/conv/1.cc | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index be8475c0cb1..752a04e01bd 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -9389,6 +9389,8 @@ namespace __detail struct _To { template + requires requires { ranges::to<_Cont>(std::declval<_Range>(), + std::declval<_Args>()...); } constexpr auto operator()(_Range&& __r, _Args&&... __args) const { @@ -9431,6 +9433,8 @@ namespace __detail struct _To2 { template + requires requires { ranges::to<_Cont>(std::declval<_Range>(), + std::declval<_Args>()...); } constexpr auto operator()(_Range&& __r, _Args&&... __args) const { diff --git a/libstdc++-v3/testsuite/std/ranges/conv/1.cc b/libstdc++-v3/testsuite/std/ranges/conv/1.cc index 6d6a708ab64..09fd515edf1 100644 --- a/libstdc++-v3/testsuite/std/ranges/conv/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/conv/1.cc @@ -448,6 +448,24 @@ test_constexpr() static_assert(x == 6); } +void +test_sfinae() +{ + // PR libstdc++/112802 + [](auto x) { + static_assert(!requires { std::ranges::to>()(x); }); + static_assert(!requires { std::ranges::to()(x); }); + }(0); +} + +void +test_composition() +{ + // PR libstdc++/113068 + auto adaptor = std::ranges::to() | std::ranges::to(); + auto str = adaptor(" "); +} + int main() { test_p1206r7_examples(); @@ -460,4 +478,6 @@ int main() test_lwg3984(); test_nodiscard(); test_constexpr(); + test_sfinae(); + test_composition(); }