From patchwork Tue Apr 27 14:55:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1470714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Daw/1y7P; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FV4Zn5fm2z9sXG for ; Wed, 28 Apr 2021 00:56:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8973398B89F; Tue, 27 Apr 2021 14:55:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8973398B89F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1619535356; bh=UgV54/7lyIIJKkiI1oTUnbTG4kxcOhXYFDNotHYlxb4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Daw/1y7PIPafrF2T1LuHe51CUw+yqmWC5tQnLwurpRlWRPl7ny3yeE0JoElqAnspQ afKLu4j68uNbNR/tH1hT1/XT6iVfVQumuIb7Nivfn9XMD5J7cJJkeAW5e4F5aFBq4L BinBSSwu1x/LK5GJZaDrhc/2vs/fZKJYcpKfl4uM= 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 52E2A389367D for ; Tue, 27 Apr 2021 14:55:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 52E2A389367D Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-gU0rSTfvMtqhNHbp52Lqwg-1; Tue, 27 Apr 2021 10:55:49 -0400 X-MC-Unique: gU0rSTfvMtqhNHbp52Lqwg-1 Received: by mail-qk1-f199.google.com with SMTP id e4-20020a37b5040000b02902df9a0070efso23195039qkf.18 for ; Tue, 27 Apr 2021 07:55:49 -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=UgV54/7lyIIJKkiI1oTUnbTG4kxcOhXYFDNotHYlxb4=; b=OK0P0Nzub/vJNJgZPSh3GC+tGxFMVHEKfX0H3sWSi6IQLO/0M8ZJ6cKxXA/3TLWh6h T3gKSbOYV0uqJZFAooWnUwXvGNo0Qw1GiQUWz2O4zLkzPdiwOt7ob9VUj1j0JUpRlEdv gspXC0eqD/XTwOfFdbjbkaA0DNpdru9fNBIzloKQyCD5NMZ235RwJRssrL/5c4+mTS/T HCzubukLyrR5fdLofhv1nkRB3DuJcp/KTuoP86hEZ8BAHJc3I1oy40Qs8XA2RFv7RvDI coIQgIVvU3O/QiiTD35RC+ZDviS9mobzkJUjhpalNeFUFJ+OQayoG4uIBuQZ5w1P3Qgj 5cFQ== X-Gm-Message-State: AOAM531wPN42j3PXFhEsJMEHfGqNy7HAeEsvr+Dwie4MEs9dKRh8nA4V +o0MNeKP95gfrn3DKd7XAPWJXNTwdItDJpVHbsL192FgppouwvYNfi+BCM70ObfGVlKECEShHLT 1s0ZiwYpbHpMH1WRe0gnRSmYqSH3DCeg6fNZpSgJhHZ/Suy0ZPF0gn3ZsXCVAEBpLgC4= X-Received: by 2002:a37:c209:: with SMTP id i9mr15013091qkm.363.1619535348037; Tue, 27 Apr 2021 07:55:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp9iktYD+0EVGSeCteffWSJz1ObL6IQ+nWAOGZFEoTD78COhkqkUezDrjK0dgncWGFVOJX7w== X-Received: by 2002:a37:c209:: with SMTP id i9mr15013067qkm.363.1619535347727; Tue, 27 Apr 2021 07:55:47 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id j9sm3105392qkm.10.2021.04.27.07.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 07:55:47 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Fix up lambda in join_view::_Iterator::operator++ [PR100290] Date: Tue, 27 Apr 2021 10:55:42 -0400 Message-Id: <20210427145542.2951069-1-ppalka@redhat.com> X-Mailer: git-send-email 2.31.1.362.g311531c9de MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Currently, the return type of this lambda is decltype(auto), so it ends up returning a copy of _M_parent->_M_inner rather than a reference to it when _S_ref_glvalue is false. Hence _M_inner and ranges::end(__inner_range) are respectively an iterator and sentinel for different ranges, so comparing them is undefined. Tested on x86_64-pc-linux-gnu, does this look OK for trunk/11/10? libstdc++-v3/ChangeLog: PR libstdc++/100290 * include/std/ranges (join_view::_Iterator::operator++): Correct the return type of the lambda to avoid returning a copy of _M_parent->_M_inner. * testsuite/std/ranges/adaptors/join.cc (test10): New test. --- libstdc++-v3/include/std/ranges | 2 +- libstdc++-v3/testsuite/std/ranges/adaptors/join.cc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 74075a2d6d3..09115e9b45f 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2389,7 +2389,7 @@ namespace views::__adaptor constexpr _Iterator& operator++() { - auto&& __inner_range = [this] () -> decltype(auto) { + auto&& __inner_range = [this] () -> auto&& { if constexpr (_S_ref_is_glvalue) return *_M_outer; else diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc index fb06a7698af..e6c71d771de 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc @@ -160,6 +160,16 @@ test09() static_assert(!requires { 0 | join; }); } +void +test10() +{ + // PR libstdc++/100290 + auto v = views::single(0) + | views::transform([](const auto& s) { return views::single(s); }) + | views::join; + VERIFY( ranges::next(v.begin()) == v.end() ); +} + int main() { @@ -172,4 +182,5 @@ main() test07(); test08(); test09(); + test10(); }