From fe993b469c528230d9a01e1ae2208610f960dd9f Mon Sep 17 00:00:00 2001
From: Patrick Palka <ppalka@redhat.com>
Date: Tue, 18 May 2021 00:28:44 -0400
Subject: [PATCH] libstdc++: Fix up semiregular-box partial specialization
 [PR100475]

This makes the in-place constructor of our partial specialization of
__box for already-semiregular types perform direct-non-list-initialization
(in accordance with the specification of the primary template), and
additionally makes the member function data() use std::__addressof.

libstdc++-v3/ChangeLog:

	PR libstdc++/100475
	* include/std/ranges (__box::__box): Use non-list-initialization
	in member initializer list of in-place constructor of the
	partial specialization for semiregular types.
	(__box::operator->): Use std::__addressof.
	* testsuite/std/ranges/adaptors/detail/semiregular_box.cc
	(test02): New test.
	* testsuite/std/ranges/single_view.cc (test04): New test.
---
 libstdc++-v3/include/std/ranges                        |  6 +++---
 .../std/ranges/adaptors/detail/semiregular_box.cc      | 18 ++++++++++++++++++
 libstdc++-v3/testsuite/std/ranges/single_view.cc       | 16 ++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 7079425..ca62f73 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -163,7 +163,7 @@ namespace ranges
 	  constexpr explicit
 	  __box(in_place_t, _Args&&... __args)
 	  noexcept(is_nothrow_constructible_v<_Tp, _Args...>)
-	  : _M_value{std::forward<_Args>(__args)...}
+	  : _M_value(std::forward<_Args>(__args)...)
 	  { }
 
 	constexpr bool
@@ -180,11 +180,11 @@ namespace ranges
 
 	constexpr _Tp*
 	operator->() noexcept
-	{ return &_M_value; }
+	{ return std::__addressof(_M_value); }
 
 	constexpr const _Tp*
 	operator->() const noexcept
-	{ return &_M_value; }
+	{ return std::__addressof(_M_value); }
       };
   } // namespace __detail
 
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc
index 65931de..ed694e0 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc
@@ -81,3 +81,21 @@ test01()
   return true;
 }
 static_assert(test01());
+
+template<bool make_semiregular>
+  struct A {
+    A() requires make_semiregular;
+    A(int, int);
+    A(std::initializer_list<int>) = delete;
+  };
+
+void
+test02()
+{
+  // PR libstdc++/100475
+  static_assert(std::semiregular<A<true>>);
+  __box<A<true>> x2(std::in_place, 0, 0);
+
+  static_assert(!std::semiregular<A<false>>);
+  __box<A<false>> x1(std::in_place, 0, 0);
+}
diff --git a/libstdc++-v3/testsuite/std/ranges/single_view.cc b/libstdc++-v3/testsuite/std/ranges/single_view.cc
index 97bc39b..f530cc0 100644
--- a/libstdc++-v3/testsuite/std/ranges/single_view.cc
+++ b/libstdc++-v3/testsuite/std/ranges/single_view.cc
@@ -58,9 +58,25 @@ test03()
   VERIFY(*std::ranges::begin(s3) == 'a');
 }
 
+void
+test04()
+{
+  // PR libstdc++/100475
+  struct A {
+    A() = default;
+    A(int, int) { }
+    A(std::initializer_list<int>) = delete;
+    void operator&() const = delete;
+  };
+  std::ranges::single_view<A> s(std::in_place, 0, 0);
+  s.data();
+  std::as_const(s).data();
+}
+
 int main()
 {
   test01();
   test02();
   test03();
+  test04();
 }
-- 
2.7.4