From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id 55F913947437; Fri, 28 Aug 2020 15:57:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55F913947437 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1598630234; bh=LnN1eyu2unWK0VRYMdnKjpAQ6av9UGpKh/A5rTGf+ko=; h=From:To:Subject:Date:From; b=w+DaeiCU7V3GJ1dl13Y+3fwwiWTPspDqywYmOmXu+GFpjRVokv0wooWGMVh2a6/EP JLyPE8TACa+Tf/Xajws4+9ha+iubidkr39UJHhyvTD/nihEp2nR+J54sl4ncDel95n VLYhYotvRNFek0b/IrA4yBtzdJnuoNc0wWTLregw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] libstdc++: Make make-unsigned-like-t<__int128> work [PR 96042] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: 23ebfda0e352fa0a92c6b012458ecb65505a135f X-Git-Newrev: e6e01618e83bcd9eb3a2b27df30ed87106a748b4 Message-Id: <20200828155714.55F913947437@sourceware.org> Date: Fri, 28 Aug 2020 15:57:14 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 15:57:14 -0000 https://gcc.gnu.org/g:e6e01618e83bcd9eb3a2b27df30ed87106a748b4 commit e6e01618e83bcd9eb3a2b27df30ed87106a748b4 Author: Jonathan Wakely Date: Wed Aug 19 20:36:10 2020 +0100 libstdc++: Make make-unsigned-like-t<__int128> work [PR 96042] As well as ensuring that numeric_limits<__int128> is defined, we need to ensure that make-unsigned-like-t and to-unsigned-like work correctly for 128-bit integers in strict mode. This ensures that a subrange created from an iota_view's iterator and sentinel can represent its size. Co-authored-by: Patrick Palka libstdc++-v3/ChangeLog: 2020-08-19 Jonathan Wakely Patrick Palka PR libstdc++/96042 * include/bits/range_access.h (__detail::__to_unsigned_like): Do not use make_unsigned_t in the return type, as it can result in an error before the integral constraint is checked. [__STRICT_ANSI__]: Add overloads for 128-bit integer types. (__detail::__make_unsigned_like_t): Define as the return type of __to_unsigned_like. * testsuite/std/ranges/subrange/96042.cc: New test. Diff: --- libstdc++-v3/include/bits/range_access.h | 18 +++++++++--- .../testsuite/std/ranges/subrange/96042.cc | 34 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h index 3eb1f2fd272..bafced31ea8 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -364,13 +364,23 @@ namespace ranges { return __max_size_type(__t); } template - constexpr make_unsigned_t<_Tp> + constexpr auto __to_unsigned_like(_Tp __t) noexcept - { return __t; } + { return static_cast>(__t); } - template> +#if defined __STRICT_ANSI__ && defined __SIZEOF_INT128__ + constexpr unsigned __int128 + __to_unsigned_like(__int128 __t) noexcept + { return __t; } + + constexpr unsigned __int128 + __to_unsigned_like(unsigned __int128 __t) noexcept + { return __t; } +#endif + + template using __make_unsigned_like_t - = conditional_t<_MaxDiff, __max_size_type, make_unsigned_t<_Tp>>; + = decltype(__detail::__to_unsigned_like(std::declval<_Tp>())); // Part of the constraints of ranges::borrowed_range template diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/96042.cc b/libstdc++-v3/testsuite/std/ranges/subrange/96042.cc new file mode 100644 index 00000000000..5826203f03c --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/subrange/96042.cc @@ -0,0 +1,34 @@ +// Copyright (C) 2020 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. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=c++20" } +// { dg-do compile { target c++2a } } + +#include + +constexpr bool +test01() +{ + using I = unsigned long long; + // view with a difference type that doesn't fit in long long: + std::ranges::iota_view v(0, std::numeric_limits::max()); + // view with a size type that doesn't fit in unsigned long long: + std::ranges::subrange sr{v.begin(), v.end()}; + auto sz = std::ranges::size(sr); + return sz == std::numeric_limits::max(); +} +static_assert( test01() );