Re: [PATCH] Define [range.cmp] comparisons for C++20

2019-10-25 Thread Jonathan Wakely

On 25/10/19 14:34 +0100, Jonathan Wakely wrote:

On 23/10/19 08:08 +0100, Jonathan Wakely wrote:

On Wed, 23 Oct 2019 at 00:33, Tam S. B.  wrote:

The use of concepts is causing `#include ` to break on clang.


OK, thanks, I'll guard it with #if.


Fixed on trunk with this patch. My Clang 7.0.1 still can't compile current
trunk though, because we now have a constexpr destructor on
std::allocator.


Which should be fixed by this, which I'll commit after testing
finishes.

commit 063495404380ebe3d28429c6ce718cd05c8d5451
Author: Jonathan Wakely 
Date:   Fri Oct 25 14:43:23 2019 +0100

Fix compilation with Clang

The new constexpr destructor on std::allocator breaks compilation with
Clang in C++2a mode. This only makes it constexpr if the compiler
supports the P0784R7 features.

* include/bits/allocator.h: Check __cpp_constexpr_dynamic_alloc
before making the std::allocator destructor constexpr.
* testsuite/20_util/allocator/requirements/constexpr.cc: New test.

diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index 2559c57b12e..00d7461e42e 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -160,7 +160,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	_GLIBCXX20_CONSTEXPR
 	allocator(const allocator<_Tp1>&) _GLIBCXX_NOTHROW { }
 
-  _GLIBCXX20_CONSTEXPR
+#if __cpp_constexpr_dynamic_alloc
+  constexpr
+#endif
   ~allocator() _GLIBCXX_NOTHROW { }
 
 #if __cplusplus > 201703L
diff --git a/libstdc++-v3/testsuite/20_util/allocator/requirements/constexpr.cc b/libstdc++-v3/testsuite/20_util/allocator/requirements/constexpr.cc
new file mode 100644
index 000..6a6dbf1833f
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/allocator/requirements/constexpr.cc
@@ -0,0 +1,28 @@
+// Copyright (C) 2019 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 
+
+constexpr bool f()
+{
+  std::allocator a;
+  return std::allocator_traits>::max_size(a) > 0;
+}
+static_assert( f() );


Re: [PATCH] Define [range.cmp] comparisons for C++20

2019-10-25 Thread Jonathan Wakely

On 23/10/19 08:08 +0100, Jonathan Wakely wrote:

On Wed, 23 Oct 2019 at 00:33, Tam S. B.  wrote:

The use of concepts is causing `#include ` to break on clang.


OK, thanks, I'll guard it with #if.


Fixed on trunk with this patch. My Clang 7.0.1 still can't compile current
trunk though, because we now have a constexpr destructor on
std::allocator.

Thanks for the report.

commit 27274f130d7c3cf8a6ccbf27c24368fbbf2fb3fb
Author: Jonathan Wakely 
Date:   Fri Oct 25 14:26:54 2019 +0100

Guard use of concepts with feature test macro

This fixes a regression when using Clang.

* include/bits/range_cmp.h: Check __cpp_lib_concepts before defining
concepts. Fix comment.

diff --git a/libstdc++-v3/include/bits/range_cmp.h b/libstdc++-v3/include/bits/range_cmp.h
index a77fd5274b9..870eb3a8ee5 100644
--- a/libstdc++-v3/include/bits/range_cmp.h
+++ b/libstdc++-v3/include/bits/range_cmp.h
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // .
 
-/** @file bits/ranges_function.h
+/** @file bits/range_cmp.h
  *  This is an internal header file, included by other library headers.
  *  Do not attempt to use it directly. @headername{functional}
  */
@@ -54,6 +54,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 using is_transparent = __is_transparent;
   };
 
+#ifdef __cpp_lib_concepts
 namespace ranges
 {
   namespace __detail
@@ -182,6 +183,7 @@ namespace ranges
   };
 
 } // namespace ranges
+#endif // library concepts
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 #endif // C++20


Re: [PATCH] Define [range.cmp] comparisons for C++20

2019-10-23 Thread Jonathan Wakely
On Wed, 23 Oct 2019 at 00:33, Tam S. B.  wrote:
>
> > commit b948d3f92d7bbe4d53237cb20ff40a15fa123988
> > Author: Jonathan Wakely 
> > Date:   Thu Oct 17 15:20:38 2019 +0100
> >
> > Define [range.cmp] comparisons for C++20
> >
> > Define std::identity, std::ranges::equal_to, std::ranges::not_equal_to,
> > std::ranges::greater, std::ranges::less, std::ranges::greater_equal and
> > std::ranges::less_equal.
> >
> > * include/Makefile.am: Add new header.
> > * include/Makefile.in: Regenerate.
> > * include/bits/range_cmp.h: New header for C++20 function 
> > objects.
> > * include/std/functional: Include new header.
> > * testsuite/20_util/function_objects/identity/1.cc: New test.
> > * testsuite/20_util/function_objects/range.cmp/equal_to.cc: New 
> > test.
> > * testsuite/20_util/function_objects/range.cmp/greater.cc: New 
> > test.
> > * 
> > testsuite/20_util/function_objects/range.cmp/greater_equal.cc: New
> > test.
> > * testsuite/20_util/function_objects/range.cmp/less.cc: New 
> > test.
> > * testsuite/20_util/function_objects/range.cmp/less_equal.cc: 
> > New test.
> > * testsuite/20_util/function_objects/range.cmp/not_equal_to.cc: 
> > New
> > test.
> >
> > diff --git a/libstdc++-v3/include/Makefile.am 
> > b/libstdc++-v3/include/Makefile.am
> > index 35ee3cfcd34..9ff12f10fb1 100644
> > --- a/libstdc++-v3/include/Makefile.am
> > +++ b/libstdc++-v3/include/Makefile.am
> > @@ -152,6 +152,7 @@ bits_headers = \
> >   ${bits_srcdir}/random.h \
> >   ${bits_srcdir}/random.tcc \
> >   ${bits_srcdir}/range_access.h \
> > + ${bits_srcdir}/range_cmp.h \
> >   ${bits_srcdir}/refwrap.h \
> >   ${bits_srcdir}/regex.h \
> >   ${bits_srcdir}/regex.tcc \
> > diff --git a/libstdc++-v3/include/bits/range_cmp.h 
> > b/libstdc++-v3/include/bits/range_cmp.h
> > new file mode 100644
> > index 000..3e5bb8847ab
> > --- /dev/null
> > +++ b/libstdc++-v3/include/bits/range_cmp.h
> > @@ -0,0 +1,179 @@
> > +// Concept-constrained comparison implementations -*- C++ -*-
> > +
> > +// Copyright (C) 2019 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
> > +// .
> > +
> > +/** @file bits/ranges_function.h
>
> This does not match the actual filename. Seems like a typo?

Yes, I renamed the file and didn't fix the comment. It's already fixed
locally and will be committed with the next round of changes (probably
today).

> > + *  This is an internal header file, included by other library headers.
> > + *  Do not attempt to use it directly. @headername{functional}
> > + */
> > +
> > +#ifndef _RANGE_CMP_H
> > +#define _RANGE_CMP_H 1
> > +
> > +#if __cplusplus > 201703L
> > +# include 
> > +# include 
> > +
> > +namespace std _GLIBCXX_VISIBILITY(default)
> > +{
> > +_GLIBCXX_BEGIN_NAMESPACE_VERSION
> > +
> > +  struct __is_transparent; // not defined
> > +
> > +  // Define std::identity here so that  and 
> > +  // don't need to include  to get it.
> > +
> > +  /// [func.identity] The identity function.
> > +  struct identity
> > +  {
> > +template
> > +  constexpr _Tp&&
> > +  operator()(_Tp&& __t) const noexcept
> > +  { return std::forward<_Tp>(__t); }
> > +
> > +using is_transparent = __is_transparent;
> > +  };
> > +
> > +namespace ranges
> > +{
> > +  namespace __detail
> > +  {
> > +// BUILTIN-PTR-CMP(T, ==, U)
> > +template
> > +  concept __eq_builtin_ptr_cmp
> > + = convertible_to<_Tp, const volatile void*>
> > +   && convertible_to<_Up, const volatile void*>
> > +   && (! requires(_Tp&& __t, _Up&& __u)
>
> The use of concepts is causing `#include ` to break on clang.

OK, thanks, I'll guard it with #if.


Re: [PATCH] Define [range.cmp] comparisons for C++20

2019-10-22 Thread Tam S. B.
> commit b948d3f92d7bbe4d53237cb20ff40a15fa123988
> Author: Jonathan Wakely 
> Date:   Thu Oct 17 15:20:38 2019 +0100
> 
> Define [range.cmp] comparisons for C++20
> 
> Define std::identity, std::ranges::equal_to, std::ranges::not_equal_to,
> std::ranges::greater, std::ranges::less, std::ranges::greater_equal and
> std::ranges::less_equal.
> 
> * include/Makefile.am: Add new header.
> * include/Makefile.in: Regenerate.
> * include/bits/range_cmp.h: New header for C++20 function objects.
> * include/std/functional: Include new header.
> * testsuite/20_util/function_objects/identity/1.cc: New test.
> * testsuite/20_util/function_objects/range.cmp/equal_to.cc: New 
> test.
> * testsuite/20_util/function_objects/range.cmp/greater.cc: New 
> test.
> * testsuite/20_util/function_objects/range.cmp/greater_equal.cc: 
> New
> test.
> * testsuite/20_util/function_objects/range.cmp/less.cc: New test.
> * testsuite/20_util/function_objects/range.cmp/less_equal.cc: New 
> test.
> * testsuite/20_util/function_objects/range.cmp/not_equal_to.cc: 
> New
> test.
> 
> diff --git a/libstdc++-v3/include/Makefile.am 
> b/libstdc++-v3/include/Makefile.am
> index 35ee3cfcd34..9ff12f10fb1 100644
> --- a/libstdc++-v3/include/Makefile.am
> +++ b/libstdc++-v3/include/Makefile.am
> @@ -152,6 +152,7 @@ bits_headers = \
>   ${bits_srcdir}/random.h \
>   ${bits_srcdir}/random.tcc \
>   ${bits_srcdir}/range_access.h \
> + ${bits_srcdir}/range_cmp.h \
>   ${bits_srcdir}/refwrap.h \
>   ${bits_srcdir}/regex.h \
>   ${bits_srcdir}/regex.tcc \
> diff --git a/libstdc++-v3/include/bits/range_cmp.h 
> b/libstdc++-v3/include/bits/range_cmp.h
> new file mode 100644
> index 000..3e5bb8847ab
> --- /dev/null
> +++ b/libstdc++-v3/include/bits/range_cmp.h
> @@ -0,0 +1,179 @@
> +// Concept-constrained comparison implementations -*- C++ -*-
> +
> +// Copyright (C) 2019 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
> +// .
> +
> +/** @file bits/ranges_function.h

This does not match the actual filename. Seems like a typo?

> + *  This is an internal header file, included by other library headers.
> + *  Do not attempt to use it directly. @headername{functional}
> + */
> +
> +#ifndef _RANGE_CMP_H
> +#define _RANGE_CMP_H 1
> +
> +#if __cplusplus > 201703L
> +# include 
> +# include 
> +
> +namespace std _GLIBCXX_VISIBILITY(default)
> +{
> +_GLIBCXX_BEGIN_NAMESPACE_VERSION
> +
> +  struct __is_transparent; // not defined
> +
> +  // Define std::identity here so that  and 
> +  // don't need to include  to get it.
> +
> +  /// [func.identity] The identity function.
> +  struct identity
> +  {
> +template
> +  constexpr _Tp&&
> +  operator()(_Tp&& __t) const noexcept
> +  { return std::forward<_Tp>(__t); }
> +
> +using is_transparent = __is_transparent;
> +  };
> +
> +namespace ranges
> +{
> +  namespace __detail
> +  {
> +// BUILTIN-PTR-CMP(T, ==, U)
> +template
> +  concept __eq_builtin_ptr_cmp
> + = convertible_to<_Tp, const volatile void*>
> +   && convertible_to<_Up, const volatile void*>
> +   && (! requires(_Tp&& __t, _Up&& __u)

The use of concepts is causing `#include ` to break on clang.

> +   { operator==(std::forward<_Tp>(__t), std::forward<_Up>(__u)); }
> +   &&
> +   ! requires(_Tp&& __t, _Up&& __u)
> +   { std::forward<_Tp>(__t).operator==(std::forward<_Up>(__u)); });
> +
> +// BUILTIN-PTR-CMP(T, <, U)
> +template
> +  concept __less_builtin_ptr_cmp
> + = convertible_to<_Tp, const volatile void*>
> +   && convertible_to<_Up, const volatile void*>
> +   && (! requires(_Tp&& __t, _Up&& __u)
> +   { operator<(std::forward<_Tp>(__t), std::forward<_Up>(__u)); }
> +   && ! requires(_Tp&& __t, _Up&& __u)
> +   { 

Re: [PATCH] Define [range.cmp] comparisons for C++20

2019-10-18 Thread Jonathan Wakely

On 17/10/19 16:40 +0100, Jonathan Wakely wrote:

Define std::identity, std::ranges::equal_to, std::ranges::not_equal_to,
std::ranges::greater, std::ranges::less, std::ranges::greater_equal and
std::ranges::less_equal.

* include/Makefile.am: Add new header.
* include/Makefile.in: Regenerate.
* include/bits/range_cmp.h: New header for C++20 function objects.
* include/std/functional: Include new header.
* testsuite/20_util/function_objects/identity/1.cc: New test.
* testsuite/20_util/function_objects/range.cmp/equal_to.cc: New test.
* testsuite/20_util/function_objects/range.cmp/greater.cc: New test.
* testsuite/20_util/function_objects/range.cmp/greater_equal.cc: New
test.
* testsuite/20_util/function_objects/range.cmp/less.cc: New test.
* testsuite/20_util/function_objects/range.cmp/less_equal.cc: New test.
* testsuite/20_util/function_objects/range.cmp/not_equal_to.cc: New
test.


This removes the dependency on std::less, so that ranges::less doesn't
need to instantiate another template, and  doesn't
need to include . Various components in 
and  require ranges::less but don't necessarily need to depend
on everything in , so this removes unnecessary
coupling between the new ranges world and the old STL world.

Tested powerpc64le-linux, committed to trunk.

commit cc43d4d492ecc64cc3aac8b47aae759942d9e57f
Author: Jonathan Wakely 
Date:   Thu Oct 17 18:56:46 2019 +0100

Implement std::ranges::less without std::less

* include/bits/range_cmp.h (ranges::less::operator()): Inline the
logic from std::less::operator() to remove the dependency on it.

diff --git a/libstdc++-v3/include/bits/range_cmp.h b/libstdc++-v3/include/bits/range_cmp.h
index 3e5bb8847ab..a77fd5274b9 100644
--- a/libstdc++-v3/include/bits/range_cmp.h
+++ b/libstdc++-v3/include/bits/range_cmp.h
@@ -121,10 +121,19 @@ namespace ranges
   noexcept(noexcept(std::declval<_Tp>() < std::declval<_Up>()))
   {
 	if constexpr (__detail::__less_builtin_ptr_cmp<_Tp, _Up>)
-	  return std::less{}(
-	  static_cast(std::forward<_Tp>(__t)),
+	  {
+#ifdef __cpp_lib_is_constant_evaluated
+	if (std::is_constant_evaluated())
+	  return __t < __u;
+#endif
+	auto __x = reinterpret_cast<__UINTPTR_TYPE__>(
+	  static_cast(std::forward<_Tp>(__t)));
+	auto __y = reinterpret_cast<__UINTPTR_TYPE__>(
 	  static_cast(std::forward<_Up>(__u)));
-	return std::forward<_Tp>(__t) < std::forward<_Up>(__u);
+	return __x < __y;
+	  }
+	else
+	  return std::forward<_Tp>(__t) < std::forward<_Up>(__u);
   }
 
 using is_transparent = __is_transparent;


[PATCH] Define [range.cmp] comparisons for C++20

2019-10-17 Thread Jonathan Wakely

Define std::identity, std::ranges::equal_to, std::ranges::not_equal_to,
std::ranges::greater, std::ranges::less, std::ranges::greater_equal and
std::ranges::less_equal.

* include/Makefile.am: Add new header.
* include/Makefile.in: Regenerate.
* include/bits/range_cmp.h: New header for C++20 function objects.
* include/std/functional: Include new header.
* testsuite/20_util/function_objects/identity/1.cc: New test.
* testsuite/20_util/function_objects/range.cmp/equal_to.cc: New test.
* testsuite/20_util/function_objects/range.cmp/greater.cc: New test.
* testsuite/20_util/function_objects/range.cmp/greater_equal.cc: New
test.
* testsuite/20_util/function_objects/range.cmp/less.cc: New test.
* testsuite/20_util/function_objects/range.cmp/less_equal.cc: New test.
* testsuite/20_util/function_objects/range.cmp/not_equal_to.cc: New
test.

Tested powerpc64le-linux, committed to trunk.


commit b948d3f92d7bbe4d53237cb20ff40a15fa123988
Author: Jonathan Wakely 
Date:   Thu Oct 17 15:20:38 2019 +0100

Define [range.cmp] comparisons for C++20

Define std::identity, std::ranges::equal_to, std::ranges::not_equal_to,
std::ranges::greater, std::ranges::less, std::ranges::greater_equal and
std::ranges::less_equal.

* include/Makefile.am: Add new header.
* include/Makefile.in: Regenerate.
* include/bits/range_cmp.h: New header for C++20 function objects.
* include/std/functional: Include new header.
* testsuite/20_util/function_objects/identity/1.cc: New test.
* testsuite/20_util/function_objects/range.cmp/equal_to.cc: New 
test.
* testsuite/20_util/function_objects/range.cmp/greater.cc: New test.
* testsuite/20_util/function_objects/range.cmp/greater_equal.cc: New
test.
* testsuite/20_util/function_objects/range.cmp/less.cc: New test.
* testsuite/20_util/function_objects/range.cmp/less_equal.cc: New 
test.
* testsuite/20_util/function_objects/range.cmp/not_equal_to.cc: New
test.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 35ee3cfcd34..9ff12f10fb1 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -152,6 +152,7 @@ bits_headers = \
${bits_srcdir}/random.h \
${bits_srcdir}/random.tcc \
${bits_srcdir}/range_access.h \
+   ${bits_srcdir}/range_cmp.h \
${bits_srcdir}/refwrap.h \
${bits_srcdir}/regex.h \
${bits_srcdir}/regex.tcc \
diff --git a/libstdc++-v3/include/bits/range_cmp.h 
b/libstdc++-v3/include/bits/range_cmp.h
new file mode 100644
index 000..3e5bb8847ab
--- /dev/null
+++ b/libstdc++-v3/include/bits/range_cmp.h
@@ -0,0 +1,179 @@
+// Concept-constrained comparison implementations -*- C++ -*-
+
+// Copyright (C) 2019 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
+// .
+
+/** @file bits/ranges_function.h
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{functional}
+ */
+
+#ifndef _RANGE_CMP_H
+#define _RANGE_CMP_H 1
+
+#if __cplusplus > 201703L
+# include 
+# include 
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  struct __is_transparent; // not defined
+
+  // Define std::identity here so that  and 
+  // don't need to include  to get it.
+
+  /// [func.identity] The identity function.
+  struct identity
+  {
+template
+  constexpr _Tp&&
+  operator()(_Tp&& __t) const noexcept
+  { return std::forward<_Tp>(__t); }
+
+using is_transparent = __is_transparent;
+  };
+
+namespace ranges
+{
+  namespace __detail
+  {
+// BUILTIN-PTR-CMP(T, ==, U)
+template
+  concept __eq_builtin_ptr_cmp
+   = convertible_to<_Tp, const volatile void*>
+ && convertible_to<_Up, const volatile void*>
+