From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id ED13E3954424; Wed, 17 Jun 2020 18:26:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED13E3954424 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592418400; bh=Iplh9h7KpMpxxqt07gl3vTb0OczAMCPwEG+FcjOoFs4=; h=From:To:Subject:Date:From; b=DxJei0XyfIukIUMJQ3Q4kv23mlkeWYvcyIR8M4BE4WJ35GHg6FzD+syCmltNy6ek4 bzETRr2KslmHvIA0+jRd7/7J7biXlrHrhIuLkNRZJhF4a08tWrvQl2u/AV3LXvYl4C mlYQXlpHdNjI+z8IJZfY33pceVygb0QiKrTOV3u0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Make std::compare_three_way check if <=> is valid (PR 93479) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: 5cd2e126f5c5705fa1aa7fafef3d6b94a99593da X-Git-Newrev: 83b0201035cfdc1d4d80153f4e19ec98cf059941 Message-Id: <20200617182640.ED13E3954424@sourceware.org> Date: Wed, 17 Jun 2020 18:26:40 +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: Wed, 17 Jun 2020 18:26:41 -0000 https://gcc.gnu.org/g:83b0201035cfdc1d4d80153f4e19ec98cf059941 commit 83b0201035cfdc1d4d80153f4e19ec98cf059941 Author: Jonathan Wakely Date: Wed Jan 29 13:36:15 2020 +0000 libstdc++: Make std::compare_three_way check if <=> is valid (PR 93479) Currently types that cannot be compared using <=> but which are convertible to pointers will be compared by converting to pointers first. They should not be comparable. PR libstdc++/93479 * libsupc++/compare (__3way_builtin_ptr_cmp): Require <=> to be valid. * testsuite/18_support/comparisons/object/93479.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 4 ++ libstdc++-v3/libsupc++/compare | 4 +- .../18_support/comparisons/object/93479.cc | 44 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 133e216cc59..2c3d33e96ca 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2020-01-29 Jonathan Wakely + PR libstdc++/93479 + * libsupc++/compare (__3way_builtin_ptr_cmp): Require <=> to be valid. + * testsuite/18_support/comparisons/object/93479.cc: New test. + * testsuite/std/ranges/access/end.cc: Do not assume test_range::end() returns the same type as test_range::begin(). Add comments. * testsuite/std/ranges/access/rbegin.cc: Likewise. diff --git a/libstdc++-v3/libsupc++/compare b/libstdc++-v3/libsupc++/compare index 117340ff184..aabd0c56530 100644 --- a/libstdc++-v3/libsupc++/compare +++ b/libstdc++-v3/libsupc++/compare @@ -525,7 +525,9 @@ namespace std // BUILTIN-PTR-THREE-WAY(T, U) template concept __3way_builtin_ptr_cmp - = convertible_to<_Tp, const volatile void*> + = requires(_Tp&& __t, _Up&& __u) + { static_cast<_Tp&&>(__t) <=> static_cast<_Up&&>(__u); } + && convertible_to<_Tp, const volatile void*> && convertible_to<_Up, const volatile void*> && ! requires(_Tp&& __t, _Up&& __u) { operator<=>(static_cast<_Tp&&>(__t), static_cast<_Up&&>(__u)); } diff --git a/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc b/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc new file mode 100644 index 00000000000..7da1df15848 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/comparisons/object/93479.cc @@ -0,0 +1,44 @@ +// 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=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include + +void +test01() +{ + // PR libstdc++/93479 + int i[1]; + int j[1]; + std::compare_three_way{}(i, j); // { dg-error "no match" } +} + +void +test02() +{ + struct X + { + operator const char*() const noexcept { return "!"; } + void operator<=>(X) const = delete; + void operator<=>(const void*) const = delete; + } x; + std::compare_three_way{}(x, x); // { dg-error "no match" } + std::compare_three_way{}(x, ""); // { dg-error "no match" } + std::compare_three_way{}("", x); // { dg-error "no match" } +}