From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ppalka@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1888)
 id 1AA913858434; Tue, 12 Apr 2022 14:28:33 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AA913858434
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Patrick Palka <ppalka@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-9816] libstdc++: Implement LWG 3470 change to
 ranges::subrange
X-Act-Checkin: gcc
X-Git-Author: Patrick Palka <ppalka@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: edf73cf05a9544df77fbcdd27e1465fcaa08b343
X-Git-Newrev: 06309012df200d8028f2985665b7843dca70ec81
Message-Id: <20220412142833.1AA913858434@sourceware.org>
Date: Tue, 12 Apr 2022 14:28:33 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2022 14:28:33 -0000

https://gcc.gnu.org/g:06309012df200d8028f2985665b7843dca70ec81

commit r11-9816-g06309012df200d8028f2985665b7843dca70ec81
Author: Patrick Palka <ppalka@redhat.com>
Date:   Tue Oct 19 18:07:05 2021 -0400

    libstdc++: Implement LWG 3470 change to ranges::subrange
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/ranges_util.h
            (__detail::__uses_nonqualification_pointer_conversion): Define
            and use it ...
            (__detail::__convertible_to_nonslicing): ... here, as per LWG 3470.
            * testsuite/std/ranges/subrange/1.cc: New test.
    
    (cherry picked from commit 98af6b86bc6cac705474c14bb3f9748f6866c859)

Diff:
---
 libstdc++-v3/include/bits/ranges_util.h         | 13 +++++++++----
 libstdc++-v3/testsuite/std/ranges/subrange/1.cc | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h
index ebcd233fdb1..647670812f6 100644
--- a/libstdc++-v3/include/bits/ranges_util.h
+++ b/libstdc++-v3/include/bits/ranges_util.h
@@ -161,11 +161,16 @@ namespace ranges
 
   namespace __detail
   {
-    template<class _From, class _To>
+    template<typename _From, typename _To>
+      concept __uses_nonqualification_pointer_conversion
+	= is_pointer_v<_From> && is_pointer_v<_To>
+	  && !convertible_to<remove_pointer_t<_From>(*)[],
+			     remove_pointer_t<_To>(*)[]>;
+
+    template<typename _From, typename _To>
       concept __convertible_to_non_slicing = convertible_to<_From, _To>
-	&& !(is_pointer_v<decay_t<_From>> && is_pointer_v<decay_t<_To>>
-	    && __not_same_as<remove_pointer_t<decay_t<_From>>,
-			     remove_pointer_t<decay_t<_To>>>);
+	&& !__uses_nonqualification_pointer_conversion<decay_t<_From>,
+						       decay_t<_To>>;
 
     template<typename _Tp>
       concept __pair_like
diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/1.cc b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
new file mode 100644
index 00000000000..8a53261c78c
--- /dev/null
+++ b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc
@@ -0,0 +1,19 @@
+// { dg-options "-std=gnu++20" }
+// { dg-do run { target c++20 } }
+
+#include <ranges>
+
+void
+test01()
+{
+  // LWG 3470
+  int a[3] = {1,2,3};
+  int* b[3] = {&a[2], &a[0], &a[1]};
+  auto c = std::ranges::subrange<const int*const*>(b);
+}
+
+int
+main()
+{
+  test01();
+}