From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A2ECE385842A; Mon, 18 Mar 2024 14:05:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A2ECE385842A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1710770749; bh=LVht/JxdpuGubJyU9e0SYrLAZ8+pFdtfEkXm8+keP/k=; h=From:To:Subject:Date:From; b=J8JSq7+cklyJoBtHO5U2hbqJROZLX0ZguPR9GvC3n5zTTInE/77WTE9yNH7DLUWuX /V1WvtdatNWZLtR1AIEU2d7nNzdMZA4pfZf6I7JFFmd92prjpUkj6gNH3FDD/YvEM4 grDvasPts8WYa5kmBcj0Eb/JGq87sFQSyUpR/ZRw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-10249] libstdc++: Make std::istream_iterator copy ctor constexpr (LWG 3600) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 3d7dc8f0ae9ee812f142556a3e827cd5ea115748 X-Git-Newrev: af1efe9ffeb4d21e2895081be1b88031166cdb93 Message-Id: <20240318140549.A2ECE385842A@sourceware.org> Date: Mon, 18 Mar 2024 14:05:48 +0000 (GMT) List-Id: https://gcc.gnu.org/g:af1efe9ffeb4d21e2895081be1b88031166cdb93 commit r12-10249-gaf1efe9ffeb4d21e2895081be1b88031166cdb93 Author: Jonathan Wakely Date: Wed Mar 22 11:10:38 2023 +0000 libstdc++: Make std::istream_iterator copy ctor constexpr (LWG 3600) As explained in LWG 3600, we never implemented a C++0x change that made the copy constructor of std::istream_iterator defined as defaulted. That would be an ABI break, so the resolution of LWG 3600 is to not require it to be trivial, but just constexpr and conditionally noexcept. This applies that resolution. libstdc++-v3/ChangeLog: * include/bits/stream_iterator.h (istream_iterator): Add constexpr to copy constructor, as per LWG 3600. * testsuite/24_iterators/istream_iterator/cons/constexpr.cc: Check copy construction. (cherry picked from commit ad0b9cf1a076fb9a802d9ba7fa2223aa3166dca2) Diff: --- libstdc++-v3/include/bits/stream_iterator.h | 1 + .../testsuite/24_iterators/istream_iterator/cons/constexpr.cc | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libstdc++-v3/include/bits/stream_iterator.h b/libstdc++-v3/include/bits/stream_iterator.h index 86c5845b835..019eaf840e7 100644 --- a/libstdc++-v3/include/bits/stream_iterator.h +++ b/libstdc++-v3/include/bits/stream_iterator.h @@ -77,6 +77,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_stream(std::__addressof(__s)), _M_ok(true) { _M_read(); } + _GLIBCXX_CONSTEXPR istream_iterator(const istream_iterator& __obj) _GLIBCXX_NOEXCEPT_IF(is_nothrow_copy_constructible<_Tp>::value) : _M_stream(__obj._M_stream), _M_value(__obj._M_value), diff --git a/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/constexpr.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/constexpr.cc index 6b973c611a7..9570e7b9280 100644 --- a/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/constexpr.cc +++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/cons/constexpr.cc @@ -24,5 +24,10 @@ int main() { __gnu_test::constexpr_default_constructible test; test.operator()>(); + + // LWG 3600. Making istream_iterator copy constructor trivial is an ABI break + __gnu_test::constexpr_single_value_constructible test2; + test2.operator(), std::istream_iterator>(); + return 0; }