From patchwork Sat Dec 9 14:06:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 176191 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6098594vqy; Sat, 9 Dec 2023 07:10:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQVUn9yJ14etuRb1b3D2QKOepiVtScpiQ8uxSZq9pZWHJ0W+VSzTNaWkoG5OjeT8iCwVFR X-Received: by 2002:a9d:7f14:0:b0:6b9:dc90:8a85 with SMTP id j20-20020a9d7f14000000b006b9dc908a85mr1917751otq.24.1702134658471; Sat, 09 Dec 2023 07:10:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702134658; cv=pass; d=google.com; s=arc-20160816; b=hz6T03+NzHbHa9BQgvDnm2oVnD0ByCIqNO/ro6VlxeHEO6x8sfOPUpPL1Nd2ggmKLu 0t5/gfB2BM3A4Nj4FXGdLhR/IV+33KXUtx5557KoN8SGAUUnzrtXDkzSFruJNj0zVjAH +e/UyZ36pGcAoXa6TX0V6g+f1oJPR1/4LDuHOM/ix7xqVJohWp84oB2nK9DDEDvEI5tY 0vwgn+jrY2NPdkaDqjl/pOd2C6NgwDMKgckp3VPVcnq6B54yGpjB9F4nQW5FW9Dgkv8W FCAT/XGUCYNnffnFMIzMvAD9gAL/00G5XfW89iawrueh5cfYjFMGaG3o4p6qbkkkuuVi pNzw== 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:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=8x34JUCEyVMSZoKMs/7qw8ERRCfuoqtN3hb6AYxMoks=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=j3ywqCXbZZzjLNSUVTxbfkwZOa9DwmeJxDbcqfG+JtrU8GEhAyejhyuXIpZAtW9HvX R5W04WGsYa0u3EnDQA5zCouZF1pIXEm+4CAFWu04+UPw3NVXDLMPIpPqCcV5VKj+tWIj RlfTwS4vLBpIfWEGfBjg4SfR1TzKl1Cow0VHAJvOUsFANh01KJsiQTsIYu45VBjxD4iq 4S4Xf5szEf6gBAe+cvVlNt1lBhIpTdycmL23XrYoZNu5syFyL+yR4/fNj7gDXaLan0kR A9lOI4DtMgdLGcUWc5VjGxJbc3Whvy82X6kgfuvmn/mYsIGDPjiyUZpOYyWwMoTY7QHE 00tw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JAhiPgiV; 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 s11-20020a67e34b000000b00464a0714fb1si875352vsm.588.2023.12.09.07.10.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 07:10:58 -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=JAhiPgiV; 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 A4483385E02D for ; Sat, 9 Dec 2023 14:07:40 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id B2117385803E for ; Sat, 9 Dec 2023 14:07:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2117385803E 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 B2117385803E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702130837; cv=none; b=EERD6UCp/67O05xNJXLJuF1ixjrDOpE2exvWkiYHKi8TX3jG57PaT/r8KuxCNlUhbuNXNSQocmMU9+u1Te9u4J8xO00taKCs78J7REH0WQ6ktgc7fCh/8ccCUu+dHKlNtcIEvCu4UsGEUcMvlBtPV9RXeoga1wxlP//tXnHLDJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702130837; c=relaxed/simple; bh=R3pHASoUNiWHw+Gp8dFQYdaf32dsDSaTNVtaRyKHt+A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jrX+td/8f96zQGPv9i25jQWs5luvTcweN8ET5yC7o7csmPM+z9SA4bUWgWijJOa5o7NX6AFgoVgPOSXYdPtmM0gNuRAsDy7qC6szaBq5n4k4j7jaNlZTBCfWD1zKGJcNm4ClWCJqCL0DCThZNRVODKF5qXUWcT/g04myvcuXOrs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702130831; 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=8x34JUCEyVMSZoKMs/7qw8ERRCfuoqtN3hb6AYxMoks=; b=JAhiPgiVOlQB8qzCmLVd0V4bdfflERVcfONKDf4rPIzve0msmvdZgUpirp/pm/PR8WgXEP 7sZbB/KGTDC8HQKN44TXcudwXE656Lvxkskt2pz631CpBnpQgqHUHNuxsBGo7luC9cLk8Y hdSlJNHsPCMIzZqhHN/APVI/ZhRwrfE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-509-s1Q5Du2_M2apl3QzTCrcRQ-1; Sat, 09 Dec 2023 09:07:07 -0500 X-MC-Unique: s1Q5Du2_M2apl3QzTCrcRQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 76915185A782; Sat, 9 Dec 2023 14:07:07 +0000 (UTC) Received: from localhost (unknown [10.42.28.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4093740C6EB9; Sat, 9 Dec 2023 14:07:07 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix resolution of LWG 4016 for std::ranges::to [PR112876] Date: Sat, 9 Dec 2023 14:06:50 +0000 Message-ID: <20231209140706.1100111-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, 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: 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: 1784817551197744001 X-GMAIL-MSGID: 1784817551197744001 Tested x86_64-linux. Pushed to trunk. -- >8 -- What I implemented in r14-6199-g45630fbcf7875b does not match what I proposed for LWG 4016, and it imposes additional, unwanted requirements on the emplace and insert member functions of the container being populated. libstdc++-v3/ChangeLog: PR libstdc++/112876 * include/std/ranges (ranges::to): Do not try to use an iterator returned by the container's emplace or insert member functions. * testsuite/std/ranges/conv/1.cc (Cont4::emplace, Cont4::insert): Use the iterator parameter. Do not return an iterator. --- libstdc++-v3/include/std/ranges | 10 +++------- libstdc++-v3/testsuite/std/ranges/conv/1.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index fb9df3d3e79..be8475c0cb1 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -9300,14 +9300,10 @@ namespace __detail __c.emplace_back(*__it); else if constexpr (requires { __c.push_back(*__it); }) __c.push_back(*__it); + else if constexpr (requires { __c.emplace(__c.end(), *__it); }) + __c.emplace(__c.end(), *__it); else - { - auto __end = __c.end(); - if constexpr (requires { __c.emplace(__end, *__it); }) - __end = __c.emplace(__end, *__it); - else - __end = __c.insert(__end, *__it); - } + __c.insert(__c.end(), *__it); ++__it; } return __c; diff --git a/libstdc++-v3/testsuite/std/ranges/conv/1.cc b/libstdc++-v3/testsuite/std/ranges/conv/1.cc index b5f861dedb3..6d6a708ab64 100644 --- a/libstdc++-v3/testsuite/std/ranges/conv/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/conv/1.cc @@ -236,19 +236,19 @@ struct Cont4 template requires (Kind <= Emplace) && requires(C& c, T&& t) { c.emplace(c.end(), std::forward(t)); } - typename C::iterator - emplace(typename C::iterator, T&& t) + void + emplace(typename C::iterator pos, T&& t) { kind = Emplace; - return c.emplace(c.end(), std::forward(t)); + c.emplace(pos, std::forward(t)); } template - typename C::iterator - insert(typename C::iterator, T&& t) + void + insert(typename C::iterator pos, T&& t) { kind = Insert; - return c.insert(c.end(), std::forward(t)); + c.insert(pos, std::forward(t)); } // Required to satisfy reservable-container