From 9e67b4356efe4291fdb170fb116092f4ed9d2f05 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 30 Jul 2020 12:23:55 +0100
Subject: [PATCH] libstdc++: cv bool can't be an integer-like type (LWG 3467)

libstdc++-v3/ChangeLog:

	* include/bits/iterator_concepts.h (__detail::__cv_bool): New
	helper concept.
	(__detail::__integral_nonbool): Likewise.
	(__detail::__is_integer_like): Use __integral_nonbool.
	* testsuite/std/ranges/access/lwg3467.cc: New test.
---
 libstdc++-v3/include/bits/iterator_concepts.h |  8 ++++-
 .../testsuite/std/ranges/access/lwg3467.cc    | 33 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc

diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h
index e56abe2be6c..aad6c2dcd91 100644
--- a/libstdc++-v3/include/bits/iterator_concepts.h
+++ b/libstdc++-v3/include/bits/iterator_concepts.h
@@ -520,7 +520,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
 
     template<typename _Tp>
-      concept __is_integer_like = integral<_Tp>
+      concept __cv_bool = same_as<const volatile _Tp, const volatile bool>;
+
+    template<typename _Tp>
+      concept __integral_nonbool = integral<_Tp> && !__cv_bool<_Tp>;
+
+    template<typename _Tp>
+      concept __is_integer_like = __integral_nonbool<_Tp>
 	|| same_as<_Tp, __max_diff_type> || same_as<_Tp, __max_size_type>;
 
     template<typename _Tp>
diff --git a/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc b/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc
new file mode 100644
index 00000000000..23418b476a0
--- /dev/null
+++ b/libstdc++-v3/testsuite/std/ranges/access/lwg3467.cc
@@ -0,0 +1,33 @@
+// 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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do compile { target c++2a } }
+
+// LWG 3467. bool can't be an integer-like type
+
+#include <ranges>
+
+struct R
+{
+  bool size() const;
+};
+
+template<typename T>
+concept sized = requires(T t) { std::ranges::size(t); };
+
+static_assert( !sized<R> );
-- 
2.30.2