From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 064E93858C52; Wed, 22 Mar 2023 17:49:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 064E93858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679507362; bh=i2r1tvo2L7y7EBg4QWjKPi8ODQ/2GTyJel2bhGKq3n0=; h=From:To:Subject:Date:From; b=ApIKD1PaDvsajxM8b6gOUq1jmOfOj7zzBt+3NeNgawchUwkU01LI3+mJcwtqu7yeH /E6dnIq1lVfajnuXdU93RtWV09v5p9g6Rvyn2Tf2MIy2S2EvdGLNrjo4GDZT883Bno qGgwExlf3u69DieUtmFsTG0b2CPoDh0YR068v9kM= 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 r13-6805] libstdc++: Make std::istream_iterator copy ctor constexpr (LWG 3600) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 81d762cbec9685c2f2571da21d48f42c42eff33b X-Git-Newrev: ad0b9cf1a076fb9a802d9ba7fa2223aa3166dca2 Message-Id: <20230322174922.064E93858C52@sourceware.org> Date: Wed, 22 Mar 2023 17:49:22 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ad0b9cf1a076fb9a802d9ba7fa2223aa3166dca2 commit r13-6805-gad0b9cf1a076fb9a802d9ba7fa2223aa3166dca2 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. 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 298d4406afd..9dc4a550be6 100644 --- a/libstdc++-v3/include/bits/stream_iterator.h +++ b/libstdc++-v3/include/bits/stream_iterator.h @@ -80,6 +80,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 824cd93ecbe..95fda572d8e 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; }