From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by sourceware.org (Postfix) with ESMTPS id 91C643858D37; Sat, 23 Mar 2024 15:46:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 91C643858D37 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 91C643858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=80.241.56.151 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711208770; cv=none; b=wS/eLhcZB9ue9Q1B2eQQuyFKjgsHrnTTdIUV4h6wI6qJqEJ3wP8kOcSIykz7DEutvjXdijAZqKO13uMn0r7ND0l5fevg5+JqGp4ts3JyOCB/F/Pp4038mGvyYGJxsrzj5JS4DUHiquxqXPCUjxDlxnCIjtgkOE88i4/QKVpz1cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711208770; c=relaxed/simple; bh=TtGsgLjeUjStGAAcFMbJj/FdShj6pqieglBrgA6HdKw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XgEVRQqa+twU1uxJzMPiROQrqaJ16pi4ltXhvgpGOrdTLPIYt732iqWBXGNA76CAkHu+MwY7uFpWzbuarOhhcXzXGDa7wMWMOgoqjPy3WxRFe9ra/5/PRmcQfIRK2qJTnBovikRn9SPNuogO/ZRRNo2jHn9EQS4x1EBtdr+gkBY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (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 mout-p-101.mailbox.org (Postfix) with ESMTPS id 4V23Ss3ktqz9tGL; Sat, 23 Mar 2024 16:46:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1711208765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=swkmYWqWDDJz6upbY9NRShBNrLBYnbpWg3X7Le3wSuA=; b=pq9favty7zEjz2/fJgD0dxNSUe+wJHdZPlGtzznIxPiM6fe3EBHss8isHyJ/LiJvOMYp6p t/soZtHGsJV6yuziOYew65HmzG6yhsS+QH9NOYA73KOMRkMx23AZwSCfo2u6RlO67O4utj JW1Drg3TTsULh+ygKRX8n9pLxko5FEtI47GY88z3YyVMlE9Mi6vwUYjalzAnRsPVS2S/1n veq7xSvw1MGfCxaaNWOoGnD2a0qd3hzo/Fcias6EsNBD5OrOLpnG/zaFfUkGCO1QqNS20e jKAfJHB5px+bcAhyVlzHJXdPOkdOdWV0dKTwon+X5TCjs1MS4/WgnxzlKPoVBQ== From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Subject: [PATCH 2/2] libstdc++: fix generator iterator operator* return type Date: Sat, 23 Mar 2024 16:15:43 +0100 Message-ID: <20240323154205.1907790-3-arsen@aarsen.me> In-Reply-To: <20240323154205.1907790-1-arsen@aarsen.me> References: <20240323154205.1907790-1-arsen@aarsen.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,KAM_SHORT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Per the standard, the return type of a generators ranges iterator op* should be the reference type rather than the yielded type. The yielded type was used here by mistake. libstdc++-v3/ChangeLog: * include/std/generator (generator::_Iterator::operator*): Fix return type. * testsuite/24_iterators/range_generators/iter_deref_return.cc: New test. --- libstdc++-v3/include/std/generator | 4 +-- .../range_generators/iter_deref_return.cc | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc diff --git a/libstdc++-v3/include/std/generator b/libstdc++-v3/include/std/generator index 2d1dcced1e57..789016b5a883 100644 --- a/libstdc++-v3/include/std/generator +++ b/libstdc++-v3/include/std/generator @@ -773,12 +773,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator++(int) { this->operator++(); } - yielded + _Reference operator*() const noexcept(is_nothrow_move_constructible_v<_Reference>) { auto& __p = this->_M_coro.promise(); - return static_cast(*__p._M_value()); + return static_cast<_Reference>(*__p._M_value()); } private: diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc new file mode 100644 index 000000000000..7bdbf4d489ec --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc @@ -0,0 +1,34 @@ +// { dg-do compile { target c++23 } } +// Copyright (C) 2023-2024 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +#include + +// Check that the return type of iterator::operator* is the reference type. +// Pre-op* return type fix, this'd have resulted in a op* return type of const +// bool&. + +std::generator +foo(); + +static_assert(std::is_same_v); +static_assert(std::is_same_v); -- 2.44.0